Gigantic result of make opie-lupdate

I assume we've now 90% of the strings that will be in Opie 1.2

1851 files changed, 117308 insertions, 19015 deletions

diff --git a/i18n/cz/.ts b/i18n/cz/.ts
index a452343..55974ca 100644
--- a/i18n/cz/.ts
+++ b/i18n/cz/.ts
@@ -1,79 +1,23 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountPreferences</name>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DatePreferences</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MemoryDialog</name>
-    <message>
-        <source>Edit Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>NewAccount</name>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Child Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Credit Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Asset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liability</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>NewTransaction</name>
-    <message>
-        <source>Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QashMoney</name>
-    <message>
-        <source>QashMoney</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TransactionPreferences</name>
-    <message>
-        <source>Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/cz/addressbook.ts b/i18n/cz/addressbook.ts
index 846df2c..9961a0d 100644
--- a/i18n/cz/addressbook.ts
+++ b/i18n/cz/addressbook.ts
@@ -1,1353 +1,1351 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>AbTable</name>
     <message>
-      <source>Full Name</source>
-      <translation>Celé jméno</translation>
+        <source>Full Name</source>
+        <translation>Celé jméno</translation>
     </message>
     <message>
-      <source>Contact</source>
-      <translation>Kontakt</translation>
+        <source>Contact</source>
+        <translation>Kontakt</translation>
     </message>
     <message>
-      <source>Pick</source>
-      <translation>Výběr</translation>
+        <source>Pick</source>
+        <translation>Výběr</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>AddressbookWindow</name>
     <message>
-      <source>Contacts</source>
-      <translation>Kontakty</translation>
+        <source>Contacts</source>
+        <translation>Kontakty</translation>
     </message>
     <message>
-      <source>Contact</source>
-      <translation>Kontakt</translation>
+        <source>Contact</source>
+        <translation>Kontakt</translation>
     </message>
     <message>
-      <source>View</source>
-      <translation>Zobrazit</translation>
+        <source>View</source>
+        <translation>Zobrazit</translation>
     </message>
     <message>
-      <source>List</source>
-      <translation>Seznam</translation>
+        <source>List</source>
+        <translation>Seznam</translation>
     </message>
     <message>
-      <source>Card</source>
-      <translation>Karta</translation>
+        <source>Card</source>
+        <translation>Karta</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nový</translation>
+        <source>New</source>
+        <translation>Nový</translation>
     </message>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Find</source>
-      <translation>Hledat</translation>
+        <source>Find</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Start Search</source>
-      <translation>Spustit hledání</translation>
+        <source>Start Search</source>
+        <translation>Spustit hledání</translation>
     </message>
     <message>
-      <source>Close Find</source>
-      <translation>Zavřít hledání</translation>
+        <source>Close Find</source>
+        <translation>Zavřít hledání</translation>
     </message>
     <message>
-      <source>Write Mail To</source>
-      <translation>Napsat Mail pro</translation>
+        <source>Write Mail To</source>
+        <translation>Napsat Mail pro</translation>
     </message>
     <message>
-      <source>Beam Entry</source>
-      <translation>Odeslat položku</translation>
+        <source>Beam Entry</source>
+        <translation>Odeslat položku</translation>
     </message>
     <message>
-      <source>Import vCard</source>
-      <translation>Importovat vCard</translation>
+        <source>Import vCard</source>
+        <translation>Importovat vCard</translation>
     </message>
     <message>
-      <source>Export vCard</source>
-      <translation>Exportovat vCard</translation>
+        <source>Export vCard</source>
+        <translation>Exportovat vCard</translation>
     </message>
     <message>
-      <source>My Personal Details</source>
-      <translation>Moje osobní detaily</translation>
+        <source>My Personal Details</source>
+        <translation>Moje osobní detaily</translation>
     </message>
     <message>
-      <source>Save all Data</source>
-      <translation>Uložit všechna data</translation>
+        <source>Save all Data</source>
+        <translation>Uložit všechna data</translation>
     </message>
     <message>
-      <source>Config</source>
-      <translation>Konfigurace</translation>
+        <source>Config</source>
+        <translation>Konfigurace</translation>
     </message>
     <message>
-      <source>You have to select a contact !</source>
-      <translation>Musíte vybrat kontakt!</translation>
+        <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>
+        <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>
+        <source>Right file type ?</source>
+        <translation>Správný typ souboru?</translation>
     </message>
     <message>
-      <source>The selected file 
+        <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
-      <translation>Vybraný soubor 
+        <translation>Vybraný soubor 
 nemá koncovku &quot;.vcf&quot;. 
 Opravdu ho chcete otevřít?</translation>
     </message>
     <message>
-      <source>&amp;Yes</source>
-      <translation>&amp;Ano</translation>
+        <source>&amp;Yes</source>
+        <translation>&amp;Ano</translation>
     </message>
     <message>
-      <source>&amp;No</source>
-      <translation>&amp;Ne</translation>
+        <source>&amp;No</source>
+        <translation>&amp;Ne</translation>
     </message>
     <message>
-      <source>Add Contact?</source>
-      <translation>Přidat kontakt?</translation>
+        <source>Add Contact?</source>
+        <translation>Přidat kontakt?</translation>
     </message>
     <message>
-      <source>Do you really want add contact for 
+        <source>Do you really want add contact for 
 %1?</source>
-      <translation>Opravdu chcete přidat kontakt pro 
+        <translation>Opravdu chcete přidat kontakt pro 
 %1?</translation>
     </message>
     <message>
-      <source>&amp;All Yes</source>
-      <translation>&amp;Všechny ano</translation>
+        <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>
+        <source>Can not edit data, currently syncing</source>
+        <translation>Nelze upravit data, běží synchronizace</translation>
     </message>
     <message>
-      <source>Edit Address</source>
-      <translation>Upravit adresu</translation>
+        <source>Edit Address</source>
+        <translation>Upravit adresu</translation>
     </message>
     <message>
-      <source>Edit My Personal Details</source>
-      <translation>Upravit moje osobní detaily</translation>
+        <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>
+        <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>
+        <source>Out of space</source>
+        <translation>Došlo místo</translation>
     </message>
     <message>
-      <source>Unable to save information.
+        <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
-      <translation>Nelze uložit informace. 
+        <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>
+        <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>
+        <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>Karty</translation>
+        <source>Cards</source>
+        <translation>Karty</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Vše</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-      <source>Unfiled</source>
-      <translation>Nevyplněné</translation>
+        <source>Unfiled</source>
+        <translation>Nevyplněné</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ConfigDlg_Base</name>
     <message>
-      <source>Configuration</source>
-      <translation>Konfigurace</translation>
+        <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>
+        <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>
+        <source>Misc</source>
+        <translation>Ostatní</translation>
     </message>
     <message>
-      <source>Search Settings</source>
-      <translation>Nastavení hledání</translation>
+        <source>Search Settings</source>
+        <translation>Nastavení hledání</translation>
     </message>
     <message>
-      <source>Query Style</source>
-      <translation>Styl dotazu</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Font</source>
+        <translation>Písmo</translation>
     </message>
     <message>
-      <source>Small</source>
-      <translation>Malé</translation>
+        <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>
+        <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>
+        <source>Normal</source>
+        <translation>Normální</translation>
     </message>
     <message>
-      <source>Large</source>
-      <translation>Velké</translation>
+        <source>Large</source>
+        <translation>Velké</translation>
     </message>
     <message>
-      <source>Tool-/Menubar</source>
-      <translation>Lišta nástrojů/menu</translation>
+        <source>Tool-/Menubar</source>
+        <translation>Lišta nástrojů/menu</translation>
     </message>
     <message>
-      <source>Fixed</source>
-      <translation>Fixní</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Prefer QT-Mail </source>
+        <translation>Upřednostnit QT-Mail </translation>
     </message>
     <message>
-      <source>Use Sharp's mail application if available</source>
-      <translation>Použít mail program Sharpu, pokud je k dispozici</translation>
+        <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>
+        <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>
+        <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 
+        <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
-      <translation>Upozornění: QT-Mail je 
+        <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>
+        <source>Order</source>
+        <translation>Řazení</translation>
     </message>
     <message>
-      <source>Select Contact Order:</source>
-      <translation>Vyberte řazení kontaktů:</translation>
+        <source>Select Contact Order:</source>
+        <translation>Vyberte řazení kontaktů:</translation>
     </message>
     <message>
-      <source>Up</source>
-      <translation>Nahoru</translation>
+        <source>Up</source>
+        <translation>Nahoru</translation>
     </message>
     <message>
-      <source>Move selected attribute one line up</source>
-      <translation>Posune vybraný atribut o řádku nahoru</translation>
+        <source>Move selected attribute one line up</source>
+        <translation>Posune vybraný atribut o řádku nahoru</translation>
     </message>
     <message>
-      <source>Down</source>
-      <translation>Dolů</translation>
+        <source>Down</source>
+        <translation>Dolů</translation>
     </message>
     <message>
-      <source>Move selected attribute one line down</source>
-      <translation>Posune vybraný atribut o řádku dolů</translation>
+        <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>
+        <source>List of all available attributes</source>
+        <translation>Seznam všech dostupných atributů</translation>
     </message>
     <message>
-      <source>Add</source>
-      <translation>Přidat</translation>
+        <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>
+        <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>
+        <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>
+        <source>Remove the selected attribute from the upper list</source>
+        <translation>Odstranit vybraný atribut z horního seznamu</translation>
     </message>
     <message>
-      <source>Order (up -> down) defines the primary contact shown in the second column of the list view</source>
-      <translation>Řazení (nahoru -> dolů) definuje primární zobrazení kontaktů v druhém sloupci seznamu</translation>
+        <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>
+</context>
+<context>
     <name>ContactEditor</name>
     <message>
-      <source>Full Name...</source>
-      <translation>Celé jméno...</translation>
+        <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>
+        <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>,&lt;firstnames> 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í>,&lt;jméno> takto: &quot;de la Guerra, Carlos Pedro&quot;</translation>
+        <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>
+        <source>Job Title</source>
+        <translation>Název pracovní pozice</translation>
     </message>
     <message>
-      <source>The jobtitle..</source>
-      <translation>Název prac. pozice..</translation>
+        <source>The jobtitle..</source>
+        <translation>Název prac. pozice..</translation>
     </message>
     <message>
-      <source>Suffix</source>
-      <translation>Přípona</translation>
+        <source>Suffix</source>
+        <translation>Přípona</translation>
     </message>
     <message>
-      <source>Something like &quot;jr.&quot;..</source>
-      <translation>Něco jako &quot;jr.&quot;..</translation>
+        <source>Something like &quot;jr.&quot;..</source>
+        <translation>Něco jako &quot;jr.&quot;..</translation>
     </message>
     <message>
-      <source>Organization</source>
-      <translation>Organizace</translation>
+        <source>Organization</source>
+        <translation>Organizace</translation>
     </message>
     <message>
-      <source>The working place of the contact</source>
-      <translation>Pracovní pozice kontaktu</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Category</source>
+        <translation>Kategorie</translation>
     </message>
     <message>
-      <source>Notes...</source>
-      <translation>Poznámky...</translation>
+        <source>Notes...</source>
+        <translation>Poznámky...</translation>
     </message>
     <message>
-      <source>General</source>
-      <translation>Hlavní</translation>
+        <source>General</source>
+        <translation>Hlavní</translation>
     </message>
     <message>
-      <source>Business</source>
-      <translation>Obchodní</translation>
+        <source>Business</source>
+        <translation>Obchodní</translation>
     </message>
     <message>
-      <source>Home</source>
-      <translation>Domácí</translation>
+        <source>Home</source>
+        <translation>Domácí</translation>
     </message>
     <message>
-      <source>Address</source>
-      <translation>Adresa</translation>
+        <source>Address</source>
+        <translation>Adresa</translation>
     </message>
     <message>
-      <source>City</source>
-      <translation>Město</translation>
+        <source>City</source>
+        <translation>Město</translation>
     </message>
     <message>
-      <source>State</source>
-      <translation>Stát</translation>
+        <source>State</source>
+        <translation>Stát</translation>
     </message>
     <message>
-      <source>Zip Code</source>
-      <translation>Směrovací číslo</translation>
+        <source>Zip Code</source>
+        <translation>Směrovací číslo</translation>
     </message>
     <message>
-      <source>Country</source>
-      <translation>Země</translation>
+        <source>Country</source>
+        <translation>Země</translation>
     </message>
     <message>
-      <source>United States</source>
-      <translation>Spojené státy</translation>
+        <source>United States</source>
+        <translation>Spojené státy</translation>
     </message>
     <message>
-      <source>United Kingdom</source>
-      <translation>Spojené království</translation>
+        <source>United Kingdom</source>
+        <translation>Spojené království</translation>
     </message>
     <message>
-      <source>Afghanistan</source>
-      <translation>Afghánistán</translation>
+        <source>Afghanistan</source>
+        <translation>Afghánistán</translation>
     </message>
     <message>
-      <source>Albania</source>
-      <translation>Albánie</translation>
+        <source>Albania</source>
+        <translation>Albánie</translation>
     </message>
     <message>
-      <source>Algeria</source>
-      <translation>Alžírsko</translation>
+        <source>Algeria</source>
+        <translation>Alžírsko</translation>
     </message>
     <message>
-      <source>American Samoa</source>
-      <translation>Americká Samoa</translation>
+        <source>American Samoa</source>
+        <translation>Americká Samoa</translation>
     </message>
     <message>
-      <source>Andorra</source>
-      <translation>Andorra</translation>
+        <source>Andorra</source>
+        <translation>Andorra</translation>
     </message>
     <message>
-      <source>Angola</source>
-      <translation>Angola</translation>
+        <source>Angola</source>
+        <translation>Angola</translation>
     </message>
     <message>
-      <source>Anguilla</source>
-      <translation type="unfinished" />
+        <source>Anguilla</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Antarctica</source>
-      <translation>Antarktika</translation>
+        <source>Antarctica</source>
+        <translation>Antarktika</translation>
     </message>
     <message>
-      <source>Argentina</source>
-      <translation>Argentina</translation>
+        <source>Argentina</source>
+        <translation>Argentina</translation>
     </message>
     <message>
-      <source>Armenia</source>
-      <translation>Arménie</translation>
+        <source>Armenia</source>
+        <translation>Arménie</translation>
     </message>
     <message>
-      <source>Aruba</source>
-      <translation type="unfinished" />
+        <source>Aruba</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Australia</source>
-      <translation>Austrálie</translation>
+        <source>Australia</source>
+        <translation>Austrálie</translation>
     </message>
     <message>
-      <source>Austria</source>
-      <translation>Rakousko</translation>
+        <source>Austria</source>
+        <translation>Rakousko</translation>
     </message>
     <message>
-      <source>Azerbaijan</source>
-      <translation>Ázerbajdžán</translation>
+        <source>Azerbaijan</source>
+        <translation>Ázerbajdžán</translation>
     </message>
     <message>
-      <source>Bahamas</source>
-      <translation>Bahamy</translation>
+        <source>Bahamas</source>
+        <translation>Bahamy</translation>
     </message>
     <message>
-      <source>Bahrain</source>
-      <translation>Bahrajn</translation>
+        <source>Bahrain</source>
+        <translation>Bahrajn</translation>
     </message>
     <message>
-      <source>Bangladesh</source>
-      <translation>Bangladéš</translation>
+        <source>Bangladesh</source>
+        <translation>Bangladéš</translation>
     </message>
     <message>
-      <source>Barbados</source>
-      <translation>Barbados</translation>
+        <source>Barbados</source>
+        <translation>Barbados</translation>
     </message>
     <message>
-      <source>Belarus</source>
-      <translation>Bělorusko</translation>
+        <source>Belarus</source>
+        <translation>Bělorusko</translation>
     </message>
     <message>
-      <source>Belgium</source>
-      <translation>Belgie</translation>
+        <source>Belgium</source>
+        <translation>Belgie</translation>
     </message>
     <message>
-      <source>Belize</source>
-      <translation>Belize</translation>
+        <source>Belize</source>
+        <translation>Belize</translation>
     </message>
     <message>
-      <source>Benin</source>
-      <translation>Benin</translation>
+        <source>Benin</source>
+        <translation>Benin</translation>
     </message>
     <message>
-      <source>Bermuda</source>
-      <translation>Bermudy</translation>
+        <source>Bermuda</source>
+        <translation>Bermudy</translation>
     </message>
     <message>
-      <source>Bhutan</source>
-      <translation>Bhútán</translation>
+        <source>Bhutan</source>
+        <translation>Bhútán</translation>
     </message>
     <message>
-      <source>Bolivia</source>
-      <translation>Bolívie</translation>
+        <source>Bolivia</source>
+        <translation>Bolívie</translation>
     </message>
     <message>
-      <source>Botswana</source>
-      <translation>Botswana</translation>
+        <source>Botswana</source>
+        <translation>Botswana</translation>
     </message>
     <message>
-      <source>Bouvet Island</source>
-      <translation type="unfinished" />
+        <source>Bouvet Island</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Brazil</source>
-      <translation>Brazílie</translation>
+        <source>Brazil</source>
+        <translation>Brazílie</translation>
     </message>
     <message>
-      <source>Brunei Darussalam</source>
-      <translation>Brunej</translation>
+        <source>Brunei Darussalam</source>
+        <translation>Brunej</translation>
     </message>
     <message>
-      <source>Bulgaria</source>
-      <translation>Bulharsko</translation>
+        <source>Bulgaria</source>
+        <translation>Bulharsko</translation>
     </message>
     <message>
-      <source>Burkina Faso</source>
-      <translation>Burkina Faso</translation>
+        <source>Burkina Faso</source>
+        <translation>Burkina Faso</translation>
     </message>
     <message>
-      <source>Burundi</source>
-      <translation>Burundi</translation>
+        <source>Burundi</source>
+        <translation>Burundi</translation>
     </message>
     <message>
-      <source>Cambodia</source>
-      <translation>Kambodža</translation>
+        <source>Cambodia</source>
+        <translation>Kambodža</translation>
     </message>
     <message>
-      <source>Cameroon</source>
-      <translation>Kamerun</translation>
+        <source>Cameroon</source>
+        <translation>Kamerun</translation>
     </message>
     <message>
-      <source>Canada</source>
-      <translation>Kanada</translation>
+        <source>Canada</source>
+        <translation>Kanada</translation>
     </message>
     <message>
-      <source>Cape Verde</source>
-      <translation>Kapverdské ostrovy</translation>
+        <source>Cape Verde</source>
+        <translation>Kapverdské ostrovy</translation>
     </message>
     <message>
-      <source>Cayman Islands</source>
-      <translation>Kajmanské ostrovy</translation>
+        <source>Cayman Islands</source>
+        <translation>Kajmanské ostrovy</translation>
     </message>
     <message>
-      <source>Chad</source>
-      <translation>Čad</translation>
+        <source>Chad</source>
+        <translation>Čad</translation>
     </message>
     <message>
-      <source>Chile</source>
-      <translation>Chile</translation>
+        <source>Chile</source>
+        <translation>Chile</translation>
     </message>
     <message>
-      <source>China</source>
-      <translation>Čína</translation>
+        <source>China</source>
+        <translation>Čína</translation>
     </message>
     <message>
-      <source>Christmas Island</source>
-      <translation>Vánoční ostrov</translation>
+        <source>Christmas Island</source>
+        <translation>Vánoční ostrov</translation>
     </message>
     <message>
-      <source>Colombia</source>
-      <translation>Kolumbie</translation>
+        <source>Colombia</source>
+        <translation>Kolumbie</translation>
     </message>
     <message>
-      <source>Comoros</source>
-      <translation>Komorské ostrovy</translation>
+        <source>Comoros</source>
+        <translation>Komorské ostrovy</translation>
     </message>
     <message>
-      <source>Congo</source>
-      <translation>Kongo</translation>
+        <source>Congo</source>
+        <translation>Kongo</translation>
     </message>
     <message>
-      <source>Cook Island</source>
-      <translation type="unfinished" />
+        <source>Cook Island</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Costa Rica</source>
-      <translation>Kostarika</translation>
+        <source>Costa Rica</source>
+        <translation>Kostarika</translation>
     </message>
     <message>
-      <source>Cote d'Ivoire</source>
-      <translation>Pobřeží slonoviny</translation>
+        <source>Cote d&apos;Ivoire</source>
+        <translation>Pobřeží slonoviny</translation>
     </message>
     <message>
-      <source>Croatia</source>
-      <translation>Chorvatsko</translation>
+        <source>Croatia</source>
+        <translation>Chorvatsko</translation>
     </message>
     <message>
-      <source>Cuba</source>
-      <translation>Kuba</translation>
+        <source>Cuba</source>
+        <translation>Kuba</translation>
     </message>
     <message>
-      <source>Cyprus</source>
-      <translation>Kypr</translation>
+        <source>Cyprus</source>
+        <translation>Kypr</translation>
     </message>
     <message>
-      <source>Czech Republic</source>
-      <translation>Česká republika</translation>
+        <source>Czech Republic</source>
+        <translation>Česká republika</translation>
     </message>
     <message>
-      <source>Denmark</source>
-      <translation>Dánsko</translation>
+        <source>Denmark</source>
+        <translation>Dánsko</translation>
     </message>
     <message>
-      <source>Djibouti</source>
-      <translation>Džibuti</translation>
+        <source>Djibouti</source>
+        <translation>Džibuti</translation>
     </message>
     <message>
-      <source>Dominica</source>
-      <translation>Dominika</translation>
+        <source>Dominica</source>
+        <translation>Dominika</translation>
     </message>
     <message>
-      <source>Dominican Republic</source>
-      <translation>Dominikánská republika</translation>
+        <source>Dominican Republic</source>
+        <translation>Dominikánská republika</translation>
     </message>
     <message>
-      <source>East Timor</source>
-      <translation>Východní timur</translation>
+        <source>East Timor</source>
+        <translation>Východní timur</translation>
     </message>
     <message>
-      <source>Ecuador</source>
-      <translation>Ekvádor</translation>
+        <source>Ecuador</source>
+        <translation>Ekvádor</translation>
     </message>
     <message>
-      <source>Egypt</source>
-      <translation>Egypt</translation>
+        <source>Egypt</source>
+        <translation>Egypt</translation>
     </message>
     <message>
-      <source>El Salvador</source>
-      <translation>Salvádor</translation>
+        <source>El Salvador</source>
+        <translation>Salvádor</translation>
     </message>
     <message>
-      <source>Equatorial Guinea</source>
-      <translation>Rovníková Guinea</translation>
+        <source>Equatorial Guinea</source>
+        <translation>Rovníková Guinea</translation>
     </message>
     <message>
-      <source>Eritrea</source>
-      <translation type="unfinished" />
+        <source>Eritrea</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Estonia</source>
-      <translation>Estonsko</translation>
+        <source>Estonia</source>
+        <translation>Estonsko</translation>
     </message>
     <message>
-      <source>Ethiopia</source>
-      <translation>Etiopie</translation>
+        <source>Ethiopia</source>
+        <translation>Etiopie</translation>
     </message>
     <message>
-      <source>Falkland Islands</source>
-      <translation>falklandské ostrovy</translation>
+        <source>Falkland Islands</source>
+        <translation>falklandské ostrovy</translation>
     </message>
     <message>
-      <source>Faroe Islands</source>
-      <translation type="unfinished" />
+        <source>Faroe Islands</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Fiji</source>
-      <translation>Fidži</translation>
+        <source>Fiji</source>
+        <translation>Fidži</translation>
     </message>
     <message>
-      <source>Finland</source>
-      <translation>Finsko</translation>
+        <source>Finland</source>
+        <translation>Finsko</translation>
     </message>
     <message>
-      <source>France</source>
-      <translation>Francie</translation>
+        <source>France</source>
+        <translation>Francie</translation>
     </message>
     <message>
-      <source>French Guiana</source>
-      <translation>Francouzká Guiana</translation>
+        <source>French Guiana</source>
+        <translation>Francouzká Guiana</translation>
     </message>
     <message>
-      <source>French Polynesia</source>
-      <translation>Francouzká Polynésie</translation>
+        <source>French Polynesia</source>
+        <translation>Francouzká Polynésie</translation>
     </message>
     <message>
-      <source>Gabon</source>
-      <translation>Gabun</translation>
+        <source>Gabon</source>
+        <translation>Gabun</translation>
     </message>
     <message>
-      <source>Gambia</source>
-      <translation>Gambie</translation>
+        <source>Gambia</source>
+        <translation>Gambie</translation>
     </message>
     <message>
-      <source>Georgia</source>
-      <translation>Gruzie</translation>
+        <source>Georgia</source>
+        <translation>Gruzie</translation>
     </message>
     <message>
-      <source>Germany</source>
-      <translation>Německo</translation>
+        <source>Germany</source>
+        <translation>Německo</translation>
     </message>
     <message>
-      <source>Ghana</source>
-      <translation>Ghana</translation>
+        <source>Ghana</source>
+        <translation>Ghana</translation>
     </message>
     <message>
-      <source>Gibraltar</source>
-      <translation>Gibraltar</translation>
+        <source>Gibraltar</source>
+        <translation>Gibraltar</translation>
     </message>
     <message>
-      <source>Greece</source>
-      <translation>Řecko</translation>
+        <source>Greece</source>
+        <translation>Řecko</translation>
     </message>
     <message>
-      <source>Greenland</source>
-      <translation>Grónsko</translation>
+        <source>Greenland</source>
+        <translation>Grónsko</translation>
     </message>
     <message>
-      <source>Grenada</source>
-      <translation>Grenada</translation>
+        <source>Grenada</source>
+        <translation>Grenada</translation>
     </message>
     <message>
-      <source>Guadeloupe</source>
-      <translation type="unfinished" />
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Guam</source>
-      <translation type="unfinished" />
+        <source>Guam</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Guatemala</source>
-      <translation>Guatemala</translation>
+        <source>Guatemala</source>
+        <translation>Guatemala</translation>
     </message>
     <message>
-      <source>Guinea</source>
-      <translation>Guinea</translation>
+        <source>Guinea</source>
+        <translation>Guinea</translation>
     </message>
     <message>
-      <source>Guinea-Bissau</source>
-      <translation>Guinea-Bissau</translation>
+        <source>Guinea-Bissau</source>
+        <translation>Guinea-Bissau</translation>
     </message>
     <message>
-      <source>Guyana</source>
-      <translation>Guayana</translation>
+        <source>Guyana</source>
+        <translation>Guayana</translation>
     </message>
     <message>
-      <source>Haiti</source>
-      <translation>Haiti</translation>
+        <source>Haiti</source>
+        <translation>Haiti</translation>
     </message>
     <message>
-      <source>Holy See</source>
-      <translation type="unfinished" />
+        <source>Holy See</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Honduras</source>
-      <translation>Honduras</translation>
+        <source>Honduras</source>
+        <translation>Honduras</translation>
     </message>
     <message>
-      <source>Hong Kong</source>
-      <translation>Hong Kong</translation>
+        <source>Hong Kong</source>
+        <translation>Hong Kong</translation>
     </message>
     <message>
-      <source>Hungary</source>
-      <translation>Maďarsko</translation>
+        <source>Hungary</source>
+        <translation>Maďarsko</translation>
     </message>
     <message>
-      <source>Iceland</source>
-      <translation>Island</translation>
+        <source>Iceland</source>
+        <translation>Island</translation>
     </message>
     <message>
-      <source>India</source>
-      <translation>Indie</translation>
+        <source>India</source>
+        <translation>Indie</translation>
     </message>
     <message>
-      <source>Indonesia</source>
-      <translation>Indonésie</translation>
+        <source>Indonesia</source>
+        <translation>Indonésie</translation>
     </message>
     <message>
-      <source>Ireland</source>
-      <translation>Irsko</translation>
+        <source>Ireland</source>
+        <translation>Irsko</translation>
     </message>
     <message>
-      <source>Israel</source>
-      <translation>Izrael</translation>
+        <source>Israel</source>
+        <translation>Izrael</translation>
     </message>
     <message>
-      <source>Italy</source>
-      <translation>Itálie</translation>
+        <source>Italy</source>
+        <translation>Itálie</translation>
     </message>
     <message>
-      <source>Jamaica</source>
-      <translation>Jamajka</translation>
+        <source>Jamaica</source>
+        <translation>Jamajka</translation>
     </message>
     <message>
-      <source>Japan</source>
-      <translation>Japonsko</translation>
+        <source>Japan</source>
+        <translation>Japonsko</translation>
     </message>
     <message>
-      <source>Jordan</source>
-      <translation>Jordán</translation>
+        <source>Jordan</source>
+        <translation>Jordán</translation>
     </message>
     <message>
-      <source>Kazakhstan</source>
-      <translation>Kazachstán</translation>
+        <source>Kazakhstan</source>
+        <translation>Kazachstán</translation>
     </message>
     <message>
-      <source>Kenya</source>
-      <translation>Keňa</translation>
+        <source>Kenya</source>
+        <translation>Keňa</translation>
     </message>
     <message>
-      <source>Kiribati</source>
-      <translation>Kiribati</translation>
+        <source>Kiribati</source>
+        <translation>Kiribati</translation>
     </message>
     <message>
-      <source>Korea</source>
-      <translation>Korea</translation>
+        <source>Korea</source>
+        <translation>Korea</translation>
     </message>
     <message>
-      <source>Kuwait</source>
-      <translation>Kuvajt</translation>
+        <source>Kuwait</source>
+        <translation>Kuvajt</translation>
     </message>
     <message>
-      <source>Kyrgyzstan</source>
-      <translation>Kyrgizstán</translation>
+        <source>Kyrgyzstan</source>
+        <translation>Kyrgizstán</translation>
     </message>
     <message>
-      <source>Laos</source>
-      <translation>Laos</translation>
+        <source>Laos</source>
+        <translation>Laos</translation>
     </message>
     <message>
-      <source>Latvia</source>
-      <translation>Lotyšsko</translation>
+        <source>Latvia</source>
+        <translation>Lotyšsko</translation>
     </message>
     <message>
-      <source>Lebanon</source>
-      <translation>Libanon</translation>
+        <source>Lebanon</source>
+        <translation>Libanon</translation>
     </message>
     <message>
-      <source>Lesotho</source>
-      <translation>Lesotho</translation>
+        <source>Lesotho</source>
+        <translation>Lesotho</translation>
     </message>
     <message>
-      <source>Liberia</source>
-      <translation>Libérie</translation>
+        <source>Liberia</source>
+        <translation>Libérie</translation>
     </message>
     <message>
-      <source>Liechtenstein</source>
-      <translation>Lichtenštejnsko</translation>
+        <source>Liechtenstein</source>
+        <translation>Lichtenštejnsko</translation>
     </message>
     <message>
-      <source>Lithuania</source>
-      <translation>Litva</translation>
+        <source>Lithuania</source>
+        <translation>Litva</translation>
     </message>
     <message>
-      <source>Luxembourg</source>
-      <translation>Lucembursko</translation>
+        <source>Luxembourg</source>
+        <translation>Lucembursko</translation>
     </message>
     <message>
-      <source>Macau</source>
-      <translation type="unfinished" />
+        <source>Macau</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Macedonia</source>
-      <translation>Makedonie</translation>
+        <source>Macedonia</source>
+        <translation>Makedonie</translation>
     </message>
     <message>
-      <source>Madagascar</source>
-      <translation>Madagaskar</translation>
+        <source>Madagascar</source>
+        <translation>Madagaskar</translation>
     </message>
     <message>
-      <source>Malawi</source>
-      <translation>Malawi</translation>
+        <source>Malawi</source>
+        <translation>Malawi</translation>
     </message>
     <message>
-      <source>Malaysia</source>
-      <translation>Malajsie</translation>
+        <source>Malaysia</source>
+        <translation>Malajsie</translation>
     </message>
     <message>
-      <source>Maldives</source>
-      <translation>Maledivy</translation>
+        <source>Maldives</source>
+        <translation>Maledivy</translation>
     </message>
     <message>
-      <source>Mali</source>
-      <translation>Mali</translation>
+        <source>Mali</source>
+        <translation>Mali</translation>
     </message>
     <message>
-      <source>Malta</source>
-      <translation>Malta</translation>
+        <source>Malta</source>
+        <translation>Malta</translation>
     </message>
     <message>
-      <source>Martinique</source>
-      <translation type="unfinished" />
+        <source>Martinique</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Mauritania</source>
-      <translation>Mauretánie</translation>
+        <source>Mauritania</source>
+        <translation>Mauretánie</translation>
     </message>
     <message>
-      <source>Mauritius</source>
-      <translation>Mauritius</translation>
+        <source>Mauritius</source>
+        <translation>Mauritius</translation>
     </message>
     <message>
-      <source>Mayotte</source>
-      <translation type="unfinished" />
+        <source>Mayotte</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Mexico</source>
-      <translation>Mexiko</translation>
+        <source>Mexico</source>
+        <translation>Mexiko</translation>
     </message>
     <message>
-      <source>Micronesia</source>
-      <translation type="unfinished" />
+        <source>Micronesia</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Moldova</source>
-      <translation>Moldávie</translation>
+        <source>Moldova</source>
+        <translation>Moldávie</translation>
     </message>
     <message>
-      <source>Monaco</source>
-      <translation>Monako</translation>
+        <source>Monaco</source>
+        <translation>Monako</translation>
     </message>
     <message>
-      <source>Mongolia</source>
-      <translation>Mongolsko</translation>
+        <source>Mongolia</source>
+        <translation>Mongolsko</translation>
     </message>
     <message>
-      <source>Montserrat</source>
-      <translation type="unfinished" />
+        <source>Montserrat</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Morocco</source>
-      <translation>Maroko</translation>
+        <source>Morocco</source>
+        <translation>Maroko</translation>
     </message>
     <message>
-      <source>Mozambique</source>
-      <translation>Mosambik</translation>
+        <source>Mozambique</source>
+        <translation>Mosambik</translation>
     </message>
     <message>
-      <source>Myanmar</source>
-      <translation>Barma</translation>
+        <source>Myanmar</source>
+        <translation>Barma</translation>
     </message>
     <message>
-      <source>Namibia</source>
-      <translation>Namibie</translation>
+        <source>Namibia</source>
+        <translation>Namibie</translation>
     </message>
     <message>
-      <source>Nauru</source>
-      <translation>Nauru</translation>
+        <source>Nauru</source>
+        <translation>Nauru</translation>
     </message>
     <message>
-      <source>Nepal</source>
-      <translation>Nepál</translation>
+        <source>Nepal</source>
+        <translation>Nepál</translation>
     </message>
     <message>
-      <source>Netherlands</source>
-      <translation>Nizozemí</translation>
+        <source>Netherlands</source>
+        <translation>Nizozemí</translation>
     </message>
     <message>
-      <source>New Caledonia</source>
-      <translation>Nová Kaledonie</translation>
+        <source>New Caledonia</source>
+        <translation>Nová Kaledonie</translation>
     </message>
     <message>
-      <source>New Zealand</source>
-      <translation>Nový Zéland</translation>
+        <source>New Zealand</source>
+        <translation>Nový Zéland</translation>
     </message>
     <message>
-      <source>Nicaragua</source>
-      <translation>Nikaragua</translation>
+        <source>Nicaragua</source>
+        <translation>Nikaragua</translation>
     </message>
     <message>
-      <source>Niger</source>
-      <translation>Niger</translation>
+        <source>Niger</source>
+        <translation>Niger</translation>
     </message>
     <message>
-      <source>Nigeria</source>
-      <translation>Nigérie</translation>
+        <source>Nigeria</source>
+        <translation>Nigérie</translation>
     </message>
     <message>
-      <source>Niue</source>
-      <translation type="unfinished" />
+        <source>Niue</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Norway</source>
-      <translation>Norsko</translation>
+        <source>Norway</source>
+        <translation>Norsko</translation>
     </message>
     <message>
-      <source>Oman</source>
-      <translation>Omán</translation>
+        <source>Oman</source>
+        <translation>Omán</translation>
     </message>
     <message>
-      <source>Pakistan</source>
-      <translation>Pákistán</translation>
+        <source>Pakistan</source>
+        <translation>Pákistán</translation>
     </message>
     <message>
-      <source>Palau</source>
-      <translation type="unfinished" />
+        <source>Palau</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Palestinian Sovereign Areas</source>
-      <translation>Palestinská území</translation>
+        <source>Palestinian Sovereign Areas</source>
+        <translation>Palestinská území</translation>
     </message>
     <message>
-      <source>Panama</source>
-      <translation>Panama</translation>
+        <source>Panama</source>
+        <translation>Panama</translation>
     </message>
     <message>
-      <source>Papua New Guinea</source>
-      <translation>Papua-Nová Guinea</translation>
+        <source>Papua New Guinea</source>
+        <translation>Papua-Nová Guinea</translation>
     </message>
     <message>
-      <source>Paraguay</source>
-      <translation>Paraguay</translation>
+        <source>Paraguay</source>
+        <translation>Paraguay</translation>
     </message>
     <message>
-      <source>Peru</source>
-      <translation>Peru</translation>
+        <source>Peru</source>
+        <translation>Peru</translation>
     </message>
     <message>
-      <source>Philippines</source>
-      <translation>Filipíny</translation>
+        <source>Philippines</source>
+        <translation>Filipíny</translation>
     </message>
     <message>
-      <source>Pitcairn Islands</source>
-      <translation type="unfinished" />
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Poland</source>
-      <translation>Polsko</translation>
+        <source>Poland</source>
+        <translation>Polsko</translation>
     </message>
     <message>
-      <source>Portugal</source>
-      <translation>Portugalsko</translation>
+        <source>Portugal</source>
+        <translation>Portugalsko</translation>
     </message>
     <message>
-      <source>Puerto Rico</source>
-      <translation>Portoriko</translation>
+        <source>Puerto Rico</source>
+        <translation>Portoriko</translation>
     </message>
     <message>
-      <source>Qatar</source>
-      <translation>Katar</translation>
+        <source>Qatar</source>
+        <translation>Katar</translation>
     </message>
     <message>
-      <source>Reunion</source>
-      <translation type="unfinished" />
+        <source>Reunion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Romania</source>
-      <translation>Rumunsko</translation>
+        <source>Romania</source>
+        <translation>Rumunsko</translation>
     </message>
     <message>
-      <source>Russia</source>
-      <translation>Rusko</translation>
+        <source>Russia</source>
+        <translation>Rusko</translation>
     </message>
     <message>
-      <source>Rwanda</source>
-      <translation>Rwanda</translation>
+        <source>Rwanda</source>
+        <translation>Rwanda</translation>
     </message>
     <message>
-      <source>Saint Lucia</source>
-      <translation type="unfinished" />
+        <source>Saint Lucia</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Samoa</source>
-      <translation>Samoa</translation>
+        <source>Samoa</source>
+        <translation>Samoa</translation>
     </message>
     <message>
-      <source>San Marino</source>
-      <translation>San Marino</translation>
+        <source>San Marino</source>
+        <translation>San Marino</translation>
     </message>
     <message>
-      <source>Saudi Arabia</source>
-      <translation>Saudská Arábie</translation>
+        <source>Saudi Arabia</source>
+        <translation>Saudská Arábie</translation>
     </message>
     <message>
-      <source>Senegal</source>
-      <translation>Senegal</translation>
+        <source>Senegal</source>
+        <translation>Senegal</translation>
     </message>
     <message>
-      <source>Seychelles</source>
-      <translation>Seychelské ostrovy</translation>
+        <source>Seychelles</source>
+        <translation>Seychelské ostrovy</translation>
     </message>
     <message>
-      <source>Sierra Leone</source>
-      <translation>Sierra Leone</translation>
+        <source>Sierra Leone</source>
+        <translation>Sierra Leone</translation>
     </message>
     <message>
-      <source>Singapore</source>
-      <translation>Singapur</translation>
+        <source>Singapore</source>
+        <translation>Singapur</translation>
     </message>
     <message>
-      <source>Slovakia</source>
-      <translation>Slovensko</translation>
+        <source>Slovakia</source>
+        <translation>Slovensko</translation>
     </message>
     <message>
-      <source>Slovenia</source>
-      <translation>Slovinsko</translation>
+        <source>Slovenia</source>
+        <translation>Slovinsko</translation>
     </message>
     <message>
-      <source>Solomon Islands</source>
-      <translation>Šalamounovy ostrovy</translation>
+        <source>Solomon Islands</source>
+        <translation>Šalamounovy ostrovy</translation>
     </message>
     <message>
-      <source>Somalia</source>
-      <translation>Somálsko</translation>
+        <source>Somalia</source>
+        <translation>Somálsko</translation>
     </message>
     <message>
-      <source>South Africa</source>
-      <translation>Jižní Afrika</translation>
+        <source>South Africa</source>
+        <translation>Jižní Afrika</translation>
     </message>
     <message>
-      <source>Spain</source>
-      <translation>Španělsko</translation>
+        <source>Spain</source>
+        <translation>Španělsko</translation>
     </message>
     <message>
-      <source>Sri Lanka</source>
-      <translation>Srí Lanka</translation>
+        <source>Sri Lanka</source>
+        <translation>Srí Lanka</translation>
     </message>
     <message>
-      <source>St. Helena</source>
-      <translation>ostrov sv. Helena</translation>
+        <source>St. Helena</source>
+        <translation>ostrov sv. Helena</translation>
     </message>
     <message>
-      <source>Sudan</source>
-      <translation>Súdán</translation>
+        <source>Sudan</source>
+        <translation>Súdán</translation>
     </message>
     <message>
-      <source>Suriname</source>
-      <translation>Surinam</translation>
+        <source>Suriname</source>
+        <translation>Surinam</translation>
     </message>
     <message>
-      <source>Swaziland</source>
-      <translation>Svazijsko</translation>
+        <source>Swaziland</source>
+        <translation>Svazijsko</translation>
     </message>
     <message>
-      <source>Sweden</source>
-      <translation>Švédsko</translation>
+        <source>Sweden</source>
+        <translation>Švédsko</translation>
     </message>
     <message>
-      <source>Switzerland</source>
-      <translation>Švýcarsko</translation>
+        <source>Switzerland</source>
+        <translation>Švýcarsko</translation>
     </message>
     <message>
-      <source>Taiwan</source>
-      <translation>Tchaj-wan</translation>
+        <source>Taiwan</source>
+        <translation>Tchaj-wan</translation>
     </message>
     <message>
-      <source>Tajikistan</source>
-      <translation>Tádžikistán</translation>
+        <source>Tajikistan</source>
+        <translation>Tádžikistán</translation>
     </message>
     <message>
-      <source>Tanzania</source>
-      <translation>Tanzánie</translation>
+        <source>Tanzania</source>
+        <translation>Tanzánie</translation>
     </message>
     <message>
-      <source>Thailand</source>
-      <translation>Thajsko</translation>
+        <source>Thailand</source>
+        <translation>Thajsko</translation>
     </message>
     <message>
-      <source>Togo</source>
-      <translation>Togo</translation>
+        <source>Togo</source>
+        <translation>Togo</translation>
     </message>
     <message>
-      <source>Tokelau</source>
-      <translation type="unfinished" />
+        <source>Tokelau</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Tonga</source>
-      <translation>Tonga</translation>
+        <source>Tonga</source>
+        <translation>Tonga</translation>
     </message>
     <message>
-      <source>Tunisia</source>
-      <translation>Tunis</translation>
+        <source>Tunisia</source>
+        <translation>Tunis</translation>
     </message>
     <message>
-      <source>Turkey</source>
-      <translation>Turecko</translation>
+        <source>Turkey</source>
+        <translation>Turecko</translation>
     </message>
     <message>
-      <source>Turkmenistan</source>
-      <translation>Turkmenistán</translation>
+        <source>Turkmenistan</source>
+        <translation>Turkmenistán</translation>
     </message>
     <message>
-      <source>Tuvalu</source>
-      <translation>Tuvalu</translation>
+        <source>Tuvalu</source>
+        <translation>Tuvalu</translation>
     </message>
     <message>
-      <source>Uganda</source>
-      <translation>Uganda</translation>
+        <source>Uganda</source>
+        <translation>Uganda</translation>
     </message>
     <message>
-      <source>Ukraine</source>
-      <translation>Ukrajina</translation>
+        <source>Ukraine</source>
+        <translation>Ukrajina</translation>
     </message>
     <message>
-      <source>Uruguay</source>
-      <translation>Uruguay</translation>
+        <source>Uruguay</source>
+        <translation>Uruguay</translation>
     </message>
     <message>
-      <source>Uzbekistan</source>
-      <translation>Uzbekistán</translation>
+        <source>Uzbekistan</source>
+        <translation>Uzbekistán</translation>
     </message>
     <message>
-      <source>Vanuatu</source>
-      <translation>Vanuatu</translation>
+        <source>Vanuatu</source>
+        <translation>Vanuatu</translation>
     </message>
     <message>
-      <source>Venezuela</source>
-      <translation>Venezuela</translation>
+        <source>Venezuela</source>
+        <translation>Venezuela</translation>
     </message>
     <message>
-      <source>Vietnam</source>
-      <translation>Vietnam</translation>
+        <source>Vietnam</source>
+        <translation>Vietnam</translation>
     </message>
     <message>
-      <source>Virgin Islands</source>
-      <translation>Panenské Ostrovy</translation>
+        <source>Virgin Islands</source>
+        <translation>Panenské Ostrovy</translation>
     </message>
     <message>
-      <source>Western Sahara</source>
-      <translation>Západní Sahara</translation>
+        <source>Western Sahara</source>
+        <translation>Západní Sahara</translation>
     </message>
     <message>
-      <source>Yemen</source>
-      <translation>Jemen</translation>
+        <source>Yemen</source>
+        <translation>Jemen</translation>
     </message>
     <message>
-      <source>Yugoslavia</source>
-      <translation>Jugoslávie</translation>
+        <source>Yugoslavia</source>
+        <translation>Jugoslávie</translation>
     </message>
     <message>
-      <source>Zambia</source>
-      <translation>Zambie</translation>
+        <source>Zambia</source>
+        <translation>Zambie</translation>
     </message>
     <message>
-      <source>Zimbabwe</source>
-      <translation>Zimbabwe</translation>
+        <source>Zimbabwe</source>
+        <translation>Zimbabwe</translation>
     </message>
     <message>
-      <source>Birthday</source>
-      <translation>Narozeniny</translation>
+        <source>Birthday</source>
+        <translation>Narozeniny</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Anniversary</source>
-      <translation>Výročí</translation>
+        <source>Anniversary</source>
+        <translation>Výročí</translation>
     </message>
     <message>
-      <source>Gender</source>
-      <translation>Pohlaví</translation>
+        <source>Gender</source>
+        <translation>Pohlaví</translation>
     </message>
     <message>
-      <source>Male</source>
-      <translation>Muž</translation>
+        <source>Male</source>
+        <translation>Muž</translation>
     </message>
     <message>
-      <source>Female</source>
-      <translation>Žena</translation>
+        <source>Female</source>
+        <translation>Žena</translation>
     </message>
     <message>
-      <source>Details</source>
-      <translation>Detaily</translation>
+        <source>Details</source>
+        <translation>Detaily</translation>
     </message>
     <message>
-      <source>Enter Note</source>
-      <translation>Vložit poznámku</translation>
+        <source>Enter Note</source>
+        <translation>Vložit poznámku</translation>
     </message>
     <message>
-      <source>Edit Name</source>
-      <translation>Upravit jméno</translation>
+        <source>Edit Name</source>
+        <translation>Upravit jméno</translation>
     </message>
     <message>
-      <source>First Name</source>
-      <translation>Křestní jméno</translation>
+        <source>First Name</source>
+        <translation>Křestní jméno</translation>
     </message>
     <message>
-      <source>Middle Name</source>
-      <translation>Střední jméno</translation>
+        <source>Middle Name</source>
+        <translation>Střední jméno</translation>
     </message>
     <message>
-      <source>Last Name</source>
-      <translation>Příjmení</translation>
+        <source>Last Name</source>
+        <translation>Příjmení</translation>
     </message>
     <message>
-      <source>Contacts</source>
-      <translation>Kontakty</translation>
+        <source>Contacts</source>
+        <translation>Kontakty</translation>
     </message>
     <message>
-      <source>Unknown</source>
-      <translation>Neznámý</translation>
+        <source>Unknown</source>
+        <translation>Neznámý</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation></translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/advancedfm.ts b/i18n/cz/advancedfm.ts
index 755ac54..fa25f48 100644
--- a/i18n/cz/advancedfm.ts
+++ b/i18n/cz/advancedfm.ts
@@ -1,387 +1,450 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>AdvancedFm</name>
     <message>
-      <source>AdvancedFm :: </source>
-      <translation>AdvancedFm :: </translation>
+        <source>AdvancedFm :: </source>
+        <translation>AdvancedFm :: </translation>
     </message>
     <message>
-      <source> kB free</source>
-      <translation> kB volno</translation>
+        <source> kB free</source>
+        <translation> kB volno</translation>
     </message>
     <message>
-      <source>Note</source>
-      <translation>Poznámka</translation>
+        <source>Note</source>
+        <translation>Poznámka</translation>
     </message>
     <message>
-      <source>That directory does not exist</source>
-      <translation>Takový adresář neexistuje</translation>
+        <source>That directory does not exist</source>
+        <translation type="obsolete">Takový adresář neexistuje</translation>
     </message>
     <message>
-      <source>Advanced FileManager
+        <source>Advanced FileManager
 is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org>
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-      <translation>Na Advanced FileManager
+        <translation type="obsolete">Na Advanced FileManager
 má práva 2002-2003
-L.J.Potter&lt;llornkcor@handhelds.org>
+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>
+        <source>Show Hidden Files</source>
+        <translation>Zobrazovat skryté soubory</translation>
     </message>
     <message>
-      <source>Change Directory</source>
-      <translation>Změnit adresář</translation>
+        <source>Change Directory</source>
+        <translation>Změnit adresář</translation>
     </message>
     <message>
-      <source>Execute</source>
-      <translation>Provést</translation>
+        <source>Execute</source>
+        <translation>Provést</translation>
     </message>
     <message>
-      <source>Open as text</source>
-      <translation>Otevřít jako text</translation>
+        <source>Open as text</source>
+        <translation>Otevřít jako text</translation>
     </message>
     <message>
-      <source>Actions</source>
-      <translation>Akce</translation>
+        <source>Actions</source>
+        <translation>Akce</translation>
     </message>
     <message>
-      <source>Make Directory</source>
-      <translation>Vytvořit adresář</translation>
+        <source>Make Directory</source>
+        <translation>Vytvořit adresář</translation>
     </message>
     <message>
-      <source>Make Symlink</source>
-      <translation>Vytvořit symbolický link</translation>
+        <source>Make Symlink</source>
+        <translation>Vytvořit symbolický link</translation>
     </message>
     <message>
-      <source>Rename</source>
-      <translation>Přejmenovat</translation>
+        <source>Rename</source>
+        <translation>Přejmenovat</translation>
     </message>
     <message>
-      <source>Copy</source>
-      <translation>Kopírovat</translation>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
     </message>
     <message>
-      <source>Copy As</source>
-      <translation>Kopírovat jako</translation>
+        <source>Copy As</source>
+        <translation>Kopírovat jako</translation>
     </message>
     <message>
-      <source>Copy Same Dir</source>
-      <translation>Kopírovat stejný adresář</translation>
+        <source>Copy Same Dir</source>
+        <translation>Kopírovat stejný adresář</translation>
     </message>
     <message>
-      <source>Move</source>
-      <translation>Přesunout</translation>
+        <source>Move</source>
+        <translation>Přesunout</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Add To Documents</source>
-      <translation>Přidat do dokumentů</translation>
+        <source>Add To Documents</source>
+        <translation>Přidat do dokumentů</translation>
     </message>
     <message>
-      <source>Run Command</source>
-      <translation>Spustit příkaz</translation>
+        <source>Run Command</source>
+        <translation>Spustit příkaz</translation>
     </message>
     <message>
-      <source>File Info</source>
-      <translation>Info o souboru</translation>
+        <source>File Info</source>
+        <translation>Info o souboru</translation>
     </message>
     <message>
-      <source>Set Permissions</source>
-      <translation>Nastavení práv</translation>
+        <source>Set Permissions</source>
+        <translation>Nastavení práv</translation>
     </message>
     <message>
-      <source>Properties</source>
-      <translation>Vlastnosti</translation>
+        <source>Properties</source>
+        <translation>Vlastnosti</translation>
     </message>
     <message>
-      <source>Beam File</source>
-      <translation>Poslat soubor</translation>
+        <source>Beam File</source>
+        <translation>Poslat soubor</translation>
     </message>
     <message>
-      <source>AdvancedFm</source>
-      <translation>AdvancedFm</translation>
+        <source>AdvancedFm</source>
+        <translation>AdvancedFm</translation>
     </message>
     <message>
-      <source>Cannot remove current directory
+        <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-      <translation>Nelze odstranit aktuální adresář 
+        <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>
+        <source>File</source>
+        <translation>Soubor</translation>
     </message>
     <message>
-      <source>View</source>
-      <translation>Zobrazit</translation>
+        <source>View</source>
+        <translation>Zobrazit</translation>
     </message>
     <message>
-      <source>File Search</source>
-      <translation>Hledání souborů</translation>
+        <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>
+        <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>
+        <source>Select All</source>
+        <translation>Vybrat vše</translation>
     </message>
     <message>
-      <source>Switch to View 1</source>
-      <translation>Přepnout do 1. okna</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Size</source>
+        <translation>Velikost</translation>
     </message>
     <message>
-      <source>Date</source>
-      <translation>Datum</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-      <source>1</source>
-      <translation>1</translation>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
-      <source>2</source>
-      <translation>2</translation>
+        <source>2</source>
+        <translation>2</translation>
     </message>
     <message>
-      <source>Really delete
+        <source>Really delete
 %1 files?</source>
-      <translation>Opravdu smazat
+        <translation type="obsolete">Opravdu smazat
 %1 soubory?</translation>
     </message>
     <message>
-      <source>Yes</source>
-      <translation>Ano</translation>
+        <source>Yes</source>
+        <translation>Ano</translation>
     </message>
     <message>
-      <source>No</source>
-      <translation>Ne</translation>
+        <source>No</source>
+        <translation>Ne</translation>
     </message>
     <message>
-      <source>Delete Directory?</source>
-      <translation>Smazat adresář?</translation>
+        <source>Delete Directory?</source>
+        <translation>Smazat adresář?</translation>
     </message>
     <message>
-      <source>Really delete %1
-and all it's contents ?</source>
-      <translation>Opravdu smazat %1
+        <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
+        <source>Really delete
 %1?</source>
-      <translation>Opravdu smazat 
+        <translation type="obsolete">Opravdu smazat 
 %1?</translation>
     </message>
     <message>
-      <source>Really copy
+        <source>Really copy
 %1 files?</source>
-      <translation>Opravdu zkopírovat
+        <translation type="obsolete">Opravdu zkopírovat
 %1 soubory?</translation>
     </message>
     <message>
-      <source>File Exists!</source>
-      <translation>Soubor existuje!</translation>
+        <source>File Exists!</source>
+        <translation>Soubor existuje!</translation>
     </message>
     <message>
-      <source>%1 exists. Ok to overwrite?</source>
-      <translation>%1 existuje. Ok pro přepsání?</translation>
+        <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>Nelze zkopírovat %1 do %2</translation>
+        <source>Could not copy %1 to %2</source>
+        <translation type="obsolete">Nelze zkopírovat %1 do %2</translation>
     </message>
     <message>
-      <source>
+        <source>
 exists. Ok to overwrite?</source>
-      <translation>
+        <translation type="obsolete">
 existuje. Ok pro přepsání?</translation>
     </message>
     <message>
-      <source>Could not copy
+        <source>Could not copy
 </source>
-      <translation>Nelze zkopírovat</translation>
+        <translation type="obsolete">Nelze zkopírovat</translation>
     </message>
     <message>
-      <source>to
+        <source>to
 </source>
-      <translation>do</translation>
+        <translation type="obsolete">do</translation>
     </message>
     <message>
-      <source>Copy </source>
-      <translation>Kopírovat</translation>
+        <source>Copy </source>
+        <translation>Kopírovat</translation>
     </message>
     <message>
-      <source> As</source>
-      <translation> Jako</translation>
+        <source> As</source>
+        <translation> Jako</translation>
     </message>
     <message>
-      <source> already exists.
+        <source> already exists.
 Do you really want to delete it?</source>
-      <translation> už existuje.
+        <translation type="obsolete"> už existuje.
 Opravdu ho chcete smazat?</translation>
     </message>
     <message>
-      <source>Could not move
+        <source>Could not move
 </source>
-      <translation>Nelze přesunout</translation>
+        <translation type="obsolete">Nelze přesunout</translation>
     </message>
     <message>
-      <source>Could not copy 
+        <source>Could not copy 
 %1 
 to 
 %2</source>
-      <translation>Nelze zkopírovat 
+        <translation type="obsolete">Nelze zkopírovat 
 %1 
 do 
 %2</translation>
     </message>
     <message>
-      <source>AdvancedFm Output</source>
-      <translation>AdvancedFm Výstup</translation>
+        <source>AdvancedFm Output</source>
+        <translation>AdvancedFm Výstup</translation>
     </message>
     <message>
-      <source>Advancedfm Beam out</source>
-      <translation>Advancedfm Odesílání</translation>
+        <source>Advancedfm Beam out</source>
+        <translation>Advancedfm Odesílání</translation>
     </message>
     <message>
-      <source>Ir sent.</source>
-      <translation>IR odesláno.</translation>
+        <source>Ir sent.</source>
+        <translation>IR odesláno.</translation>
     </message>
     <message>
-      <source>Ok</source>
-      <translation>Ok</translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-      <source>Error</source>
-      <translation>Chyba</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>Could not rename</source>
-      <translation>Nelze přejmenovat</translation>
+        <source>Could not rename</source>
+        <translation>Nelze přejmenovat</translation>
     </message>
     <message>
-      <source>Not Yet Implemented</source>
-      <translation>Nebylo ještě implementováno</translation>
+        <source>Not Yet Implemented</source>
+        <translation>Nebylo ještě implementováno</translation>
     </message>
-  </context>
-  <context>
+    <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>Výstup</translation>
+        <source>Output</source>
+        <translation>Výstup</translation>
     </message>
     <message>
-      <source>Process could not start</source>
-      <translation>Proces se nemůže spustit</translation>
+        <source>Process could not start</source>
+        <translation>Proces se nemůže spustit</translation>
     </message>
     <message>
-      <source>Error
+        <source>Error
 </source>
-      <translation>Chyba</translation>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>Save output to file (name only)</source>
-      <translation>Uložit výstup do souboru (jen jméno)</translation>
+        <source>Save output to file (name only)</source>
+        <translation>Uložit výstup do souboru (jen jméno)</translation>
     </message>
     <message>
-      <source>
+        <source>
 Finished
 </source>
-      <translation>
+        <translation>
 Dokončeno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>filePermissions</name>
     <message>
-      <source>filePermissions</source>
-      <translation>Práva souborů</translation>
+        <source>filePermissions</source>
+        <translation>Práva souborů</translation>
     </message>
     <message>
-      <source>Set File Permissions</source>
-      <translation>Nastavit práva souborů</translation>
+        <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>
+        <source>Set file permissions for:</source>
+        <translation>nastavit práva souboru pro:</translation>
     </message>
     <message>
-      <source>owner</source>
-      <translation>vlastník</translation>
+        <source>owner</source>
+        <translation>vlastník</translation>
     </message>
     <message>
-      <source>group</source>
-      <translation>skupina</translation>
+        <source>group</source>
+        <translation>skupina</translation>
     </message>
     <message>
-      <source>others</source>
-      <translation>ostatní</translation>
+        <source>others</source>
+        <translation>ostatní</translation>
     </message>
     <message>
-      <source>Owner</source>
-      <translation>Vlastník</translation>
+        <source>Owner</source>
+        <translation>Vlastník</translation>
     </message>
     <message>
-      <source>Group</source>
-      <translation>Skupina</translation>
+        <source>Group</source>
+        <translation>Skupina</translation>
     </message>
     <message>
-      <source>read</source>
-      <translation>čtení</translation>
+        <source>read</source>
+        <translation>čtení</translation>
     </message>
     <message>
-      <source>write</source>
-      <translation>zápis</translation>
+        <source>write</source>
+        <translation>zápis</translation>
     </message>
     <message>
-      <source>execute</source>
-      <translation>spouštění</translation>
+        <source>execute</source>
+        <translation>spouštění</translation>
     </message>
     <message>
-      <source>Warning</source>
-      <translation>Varování</translation>
+        <source>Warning</source>
+        <translation>Varování</translation>
     </message>
     <message>
-      <source>Error- no user</source>
-      <translation>Chyba- není uživatel</translation>
+        <source>Error- no user</source>
+        <translation>Chyba- není uživatel</translation>
     </message>
     <message>
-      <source>Error- no  group</source>
-      <translation>Chyba- není skupina</translation>
+        <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>
+        <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>
+        <source>Error setting mode</source>
+        <translation>Chyba nastavení režimu</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/appearance.ts b/i18n/cz/appearance.ts
index badaf82..e517595 100644
--- a/i18n/cz/appearance.ts
+++ b/i18n/cz/appearance.ts
@@ -1,127 +1,126 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>Appearance</name>
     <message>
-      <source>Styles control the way items such as buttons and scroll bars appear in all applications.
+        <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. 
+        <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>
+        <source>Settings...</source>
+        <translation>Nastavení...</translation>
     </message>
     <message>
-      <source>Click here to configure the currently selected style.
+        <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. 
+        <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.
+        <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. 
+        <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>
+        <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.
+        <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í. 
+        <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>
+        <source>Current scheme</source>
+        <translation>Aktuální schéma</translation>
     </message>
     <message>
-      <source>Edit...</source>
-      <translation>Upravit...</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>Vynutit stylování pro všechny aplikace.</translation>
+        <source>Force styling for all applications.</source>
+        <translation>Vynutit stylování pro všechny aplikace.</translation>
     </message>
     <message>
-      <source>Click here to allow all applications to use global appearance settings.</source>
-      <translation>Klikněte sem pro umožnení všem aplikacím používat globální nastavení vzhledu.</translation>
+        <source>Click here to allow all applications to use global appearance settings.</source>
+        <translation>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>*&lt;/b> can be used as a wildcard):</source>
-      <translation>Vypnout styl pro tylo aplikace ( &lt;b>*&lt;/b> může být použito jako wildcard):</translation>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation>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.
+        <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>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. 
+        <translation>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>Binární soubor(y)</translation>
+        <source>Binary file(s)</source>
+        <translation>Binární soubor(y)</translation>
     </message>
     <message>
-      <source>Click here to add an application to the list above.</source>
-      <translation>Klikněte pro přidání aplikace do seznamu nahoře.</translation>
+        <source>Click here to add an application to the list above.</source>
+        <translation>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>Klikněte pro vymazání aktuálně vybrané aplikace.</translation>
+        <source>Click here to delete the currently selected application.</source>
+        <translation>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>Klikněte pro přesunutí aktuálně vybrané aplikace nahoru v seznamu.</translation>
+        <source>Click here to move the currently selected application up in the list.</source>
+        <translation>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>Klikněte pro přesunutí aktuálně vybrané aplikace dolů v seznamu.</translation>
+        <source>Click here to move the currently selected application down in the list.</source>
+        <translation>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>
+        <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:
+        <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: 
+        <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é 
@@ -129,142 +128,142 @@ Tato oblast vám umožní vybrat aplikaci a nastavení, která si přejete vypno
 4. Rolovací menu s ikonami - vertikální seznam záložek s ikonami</translation>
     </message>
     <message>
-      <source>Tabs</source>
-      <translation>Záložky</translation>
+        <source>Tabs</source>
+        <translation>Záložky</translation>
     </message>
     <message>
-      <source>Tabs w/icons</source>
-      <translation>Záložky s ikonami</translation>
+        <source>Tabs w/icons</source>
+        <translation>Záložky s ikonami</translation>
     </message>
     <message>
-      <source>Drop down list</source>
-      <translation>Rolovací menu</translation>
+        <source>Drop down list</source>
+        <translation>Rolovací menu</translation>
     </message>
     <message>
-      <source>Drop down list w/icons</source>
-      <translation>Rolovací menu s ikonami</translation>
+        <source>Drop down list w/icons</source>
+        <translation>Rolovací menu s ikonami</translation>
     </message>
     <message>
-      <source>Top</source>
-      <translation>Nahoře</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Rotation direction:</source>
+        <translation>Směr rotace:</translation>
     </message>
     <message>
-      <source>Appearance Settings</source>
-      <translation>Nastavení vzhledu</translation>
+        <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>
+        <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>
+        <source>Style</source>
+        <translation>Styl</translation>
     </message>
     <message>
-      <source>Font</source>
-      <translation>Písmo</translation>
+        <source>Font</source>
+        <translation>Písmo</translation>
     </message>
     <message>
-      <source>Colors</source>
-      <translation>Barvy</translation>
+        <source>Colors</source>
+        <translation>Barvy</translation>
     </message>
     <message>
-      <source>Windows</source>
-      <translation>Okna</translation>
+        <source>Windows</source>
+        <translation>Okna</translation>
     </message>
     <message>
-      <source>Advanced</source>
-      <translation>Rozšířené</translation>
+        <source>Advanced</source>
+        <translation>Rozšířené</translation>
     </message>
     <message>
-      <source>Save Scheme</source>
-      <translation>Uložit Schéma</translation>
+        <source>Save Scheme</source>
+        <translation>Uložit Schéma</translation>
     </message>
     <message>
-      <source>Save scheme</source>
-      <translation>Uložit schéma</translation>
+        <source>Save scheme</source>
+        <translation>Uložit schéma</translation>
     </message>
     <message>
-      <source>Scheme does already exist.</source>
-      <translation>Schéma již existuje.</translation>
+        <source>Scheme does already exist.</source>
+        <translation>Schéma již existuje.</translation>
     </message>
     <message>
-      <source>Delete scheme</source>
-      <translation>Smazat schéma</translation>
+        <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>
+        <source>Unable to delete current scheme.</source>
+        <translation>Nelze smazat aktuální schéma.</translation>
     </message>
     <message>
-      <source>&lt;new></source>
-      <translation>&lt;nový></translation>
+        <source>&lt;new&gt;</source>
+        <translation>&lt;nový&gt;</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
-      <source>Edit scheme</source>
-      <translation>Upravit schéma</translation>
+        <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>
+        <source>Click here to select a color for: </source>
+        <translation>Kliknutím vyberte barvu pro:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SampleWindow</name>
     <message>
-      <source>Sample</source>
-      <translation>Vzorek</translation>
+        <source>Sample</source>
+        <translation>Vzorek</translation>
     </message>
     <message>
-      <source>Normal Item</source>
-      <translation>Normální položka</translation>
+        <source>Normal Item</source>
+        <translation>Normální položka</translation>
     </message>
     <message>
-      <source>Disabled Item</source>
-      <translation>Vypnutá položka</translation>
+        <source>Disabled Item</source>
+        <translation>Vypnutá položka</translation>
     </message>
     <message>
-      <source>Menu</source>
-      <translation>Menu</translation>
+        <source>Menu</source>
+        <translation>Menu</translation>
     </message>
     <message>
-      <source>Normal Text</source>
-      <translation>Normální text</translation>
+        <source>Normal Text</source>
+        <translation>Normální text</translation>
     </message>
     <message>
-      <source>Highlighted Text</source>
-      <translation>Zvýrazněný text</translation>
+        <source>Highlighted Text</source>
+        <translation>Zvýrazněný text</translation>
     </message>
     <message>
-      <source>Button</source>
-      <translation>Tlačítko</translation>
+        <source>Button</source>
+        <translation>Tlačítko</translation>
     </message>
     <message>
-      <source>Check Box</source>
-      <translation>Zaškrtávátko</translation>
+        <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>
+        <source>Sample window using the selected settings.</source>
+        <translation>Vzorové okno používá vybrané nastavení.</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/aqpkg.ts b/i18n/cz/aqpkg.ts
index 9550de5..ff03cae 100644
--- a/i18n/cz/aqpkg.ts
+++ b/i18n/cz/aqpkg.ts
@@ -1,378 +1,377 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>CategoryFilterImpl</name>
     <message>
-      <source>Category Filter</source>
-      <translation>Filtr kategorií</translation>
+        <source>Category Filter</source>
+        <translation>Filtr kategorií</translation>
     </message>
     <message>
-      <source>Select one or more groups</source>
-      <translation>Vyberte jednu, nebo více skupin</translation>
+        <source>Select one or more groups</source>
+        <translation>Vyberte jednu, nebo více skupin</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>DataManager</name>
     <message>
-      <source>Reading configuration...</source>
-      <translation>Načítám konfiguraci...</translation>
+        <source>Reading configuration...</source>
+        <translation>Načítám konfiguraci...</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>InputDialog</name>
     <message>
-      <source>&amp;OK</source>
-      <translation>&amp;OK</translation>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
     </message>
     <message>
-      <source>&amp;Cancel</source>
-      <translation>&amp;Storno</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>InstallDlgImpl</name>
     <message>
-      <source>Remove
+        <source>Remove
 </source>
-      <translation>Odstranit</translation>
+        <translation>Odstranit</translation>
     </message>
     <message>
-      <source>Install
+        <source>Install
 </source>
-      <translation>Instalovat</translation>
+        <translation>Instalovat</translation>
     </message>
     <message>
-      <source>Upgrade
+        <source>Upgrade
 </source>
-      <translation>Aktualizovat</translation>
+        <translation>Aktualizovat</translation>
     </message>
     <message>
-      <source>(ReInstall)</source>
-      <translation>(Přeinstalovat)</translation>
+        <source>(ReInstall)</source>
+        <translation>(Přeinstalovat)</translation>
     </message>
     <message>
-      <source>(Upgrade)</source>
-      <translation>(Aktualizovat)</translation>
+        <source>(Upgrade)</source>
+        <translation>(Aktualizovat)</translation>
     </message>
     <message>
-      <source>Destination</source>
-      <translation>Cíl</translation>
+        <source>Destination</source>
+        <translation>Cíl</translation>
     </message>
     <message>
-      <source>Space Avail</source>
-      <translation>Volné místo</translation>
+        <source>Space Avail</source>
+        <translation>Volné místo</translation>
     </message>
     <message>
-      <source>Output</source>
-      <translation>Výstup</translation>
+        <source>Output</source>
+        <translation>Výstup</translation>
     </message>
     <message>
-      <source>Start</source>
-      <translation>Start</translation>
+        <source>Start</source>
+        <translation>Start</translation>
     </message>
     <message>
-      <source>Options</source>
-      <translation>Možnosti</translation>
+        <source>Options</source>
+        <translation>Možnosti</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Vše</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Abort</source>
-      <translation>Přerušit</translation>
+        <source>Abort</source>
+        <translation>Přerušit</translation>
     </message>
     <message>
-      <source>
+        <source>
 **** User Clicked ABORT ***</source>
-      <translation>
+        <translation>
 **** Uživatel stisknul PŘERUŠIT ***</translation>
     </message>
     <message>
-      <source>**** Process Aborted ****</source>
-      <translation>**** Proces přerušen ****</translation>
+        <source>**** Process Aborted ****</source>
+        <translation>**** Proces přerušen ****</translation>
     </message>
     <message>
-      <source>Close</source>
-      <translation>Zavřít</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
     <message>
-      <source>%1 Kb</source>
-      <translation>%1 Kb</translation>
+        <source>%1 Kb</source>
+        <translation>%1 Kb</translation>
     </message>
     <message>
-      <source>Unknown</source>
-      <translation>Neznámý</translation>
+        <source>Unknown</source>
+        <translation>Neznámý</translation>
     </message>
     <message>
-      <source>Save output</source>
-      <translation>Uložit výstup</translation>
+        <source>Save output</source>
+        <translation>Uložit výstup</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>InstallOptionsDlgImpl</name>
     <message>
-      <source>Options</source>
-      <translation>Možnosti</translation>
+        <source>Options</source>
+        <translation>Možnosti</translation>
     </message>
     <message>
-      <source>Force Depends</source>
-      <translation>Přemoci závislosti</translation>
+        <source>Force Depends</source>
+        <translation>Přemoci závislosti</translation>
     </message>
     <message>
-      <source>Force Reinstall</source>
-      <translation>Vynutit přeinstalování</translation>
+        <source>Force Reinstall</source>
+        <translation>Vynutit přeinstalování</translation>
     </message>
     <message>
-      <source>Force Remove</source>
-      <translation>Vynutit odstranění</translation>
+        <source>Force Remove</source>
+        <translation>Vynutit odstranění</translation>
     </message>
     <message>
-      <source>Force Overwrite</source>
-      <translation>Vynutit přepsání</translation>
+        <source>Force Overwrite</source>
+        <translation>Vynutit přepsání</translation>
     </message>
     <message>
-      <source>Information Level</source>
-      <translation>Informační úroveň</translation>
+        <source>Information Level</source>
+        <translation>Informační úroveň</translation>
     </message>
     <message>
-      <source>Errors only</source>
-      <translation>Pouze chyby</translation>
+        <source>Errors only</source>
+        <translation>Pouze chyby</translation>
     </message>
     <message>
-      <source>Normal messages</source>
-      <translation>Normální zprávy</translation>
+        <source>Normal messages</source>
+        <translation>Normální zprávy</translation>
     </message>
     <message>
-      <source>Informative messages</source>
-      <translation>Informativní zprávy</translation>
+        <source>Informative messages</source>
+        <translation>Informativní zprávy</translation>
     </message>
     <message>
-      <source>Troubleshooting output</source>
-      <translation>Výstup při hledání chyb</translation>
+        <source>Troubleshooting output</source>
+        <translation>Výstup při hledání chyb</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Ipkg</name>
     <message>
-      <source>Dealing with package %1</source>
-      <translation>Pracuji s balíčkem %1</translation>
+        <source>Dealing with package %1</source>
+        <translation>Pracuji s balíčkem %1</translation>
     </message>
     <message>
-      <source>Removing symbolic links...
+        <source>Removing symbolic links...
 </source>
-      <translation>Odstraňuji symbolické linky...</translation>
+        <translation>Odstraňuji symbolické linky...</translation>
     </message>
     <message>
-      <source>Creating symbolic links for %1.</source>
-      <translation>Vytvářím symbolické linky pro %1.</translation>
+        <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>
+        <source>Creating symbolic links for %1</source>
+        <translation>Vytvářím symbolické linky pro %1</translation>
     </message>
     <message>
-      <source>Finished</source>
-      <translation>Hotovo</translation>
+        <source>Finished</source>
+        <translation>Hotovo</translation>
     </message>
     <message>
-      <source>Removing status entry...</source>
-      <translation>Odstraňuji položku stavu...</translation>
+        <source>Removing status entry...</source>
+        <translation>Odstraňuji položku stavu...</translation>
     </message>
     <message>
-      <source>status file - </source>
-      <translation>soubor stavu - 
+        <source>status file - </source>
+        <translation>soubor stavu - 
 </translation>
     </message>
     <message>
-      <source>package - </source>
-      <translation>balíček - 
+        <source>package - </source>
+        <translation>balíček - 
 </translation>
     </message>
     <message>
-      <source>Couldn't open status file - </source>
-      <translation>Nelze otevřít soubor stavu - 
+        <source>Couldn&apos;t open status file - </source>
+        <translation>Nelze otevřít soubor stavu - 
 </translation>
     </message>
     <message>
-      <source>Couldn't create tempory status file - </source>
-      <translation>Nelze vytvořit dočasný soubor stavu - 
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>Nelze vytvořit dočasný soubor stavu - 
 </translation>
     </message>
     <message>
-      <source>Couldn't start ipkg process</source>
-      <translation>Nelze spustit ipkg proces</translation>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>Nelze spustit ipkg proces</translation>
     </message>
     <message>
-      <source>Couldn't start ipkg-link process</source>
-      <translation>Nelze spustit ipkg-link proces</translation>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation>Nelze spustit ipkg-link proces</translation>
     </message>
     <message>
-      <source>Symbolic linking failed!
+        <source>Symbolic linking failed!
 </source>
-      <translation>Vytvoření symbolického linku selhalo!</translation>
+        <translation>Vytvoření symbolického linku selhalo!</translation>
     </message>
     <message>
-      <source>Symbolic linking succeeded.
+        <source>Symbolic linking succeeded.
 </source>
-      <translation>Vytvoření symbolického linku proběhlo.</translation>
+        <translation>Vytvoření symbolického linku proběhlo.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
-      <source>AQPkg - Package Manager</source>
-      <translation>AQPkg - Správce balíčků</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Actions</source>
+        <translation>Akce</translation>
     </message>
     <message>
-      <source>Show packages not installed</source>
-      <translation>Zobrazit nenainstalované balíčky</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Packages</source>
+        <translation>Balíčky</translation>
     </message>
     <message>
-      <source>This is a listing of all packages for the server feed selected above.
+        <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. 
+        <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. 
 
@@ -381,291 +380,301 @@ Modrá tečka s hvězdičkou označuje, že je k dispozici novější verze bal�
 Klikněte nalevo do okna pro výběr balíčku.</translation>
     </message>
     <message>
-      <source>Remove</source>
-      <translation>Odstranit</translation>
+        <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>
+        <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:
+        <source>Building server list:
 %1</source>
-      <translation>Vytvářím serverový seznam:
+        <translation type="obsolete">Vytvářím serverový seznam:
 %1</translation>
     </message>
     <message>
-      <source>Building package list for:
+        <source>Building package list for:
 %1</source>
-      <translation>Vytvářím seznam balíčků pro:
+        <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>
+        <source>Refreshing server package lists</source>
+        <translation>Obnovuji seznamy serverových balíčků</translation>
     </message>
     <message>
-      <source>WARNING: Upgrading while
+        <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
-      <translation>VAROVÁNÍ: Aktualizace, pokud 
+        <translation>VAROVÁNÍ: Aktualizace, pokud 
 běží Opie/Qtopia 
 NENÍ doporučena! 
 
 Jste si jisti?</translation>
     </message>
     <message>
-      <source>Warning</source>
-      <translation>Varování</translation>
+        <source>Warning</source>
+        <translation>Varování</translation>
     </message>
     <message>
-      <source>Upgrading installed packages</source>
-      <translation>Aktualizuji nainstalované balíčky</translation>
+        <source>Upgrading installed packages</source>
+        <translation>Aktualizuji nainstalované balíčky</translation>
     </message>
     <message>
-      <source>Are you sure you wish to delete
+        <source>Are you sure you wish to delete
 %1?</source>
-      <translation>Opravdu si přejete smazat
+        <translation>Opravdu si přejete smazat
 %1?</translation>
     </message>
     <message>
-      <source>Are you sure?</source>
-      <translation>Jste si jisti?</translation>
+        <source>Are you sure?</source>
+        <translation>Jste si jisti?</translation>
     </message>
     <message>
-      <source>No</source>
-      <translation>Ne</translation>
+        <source>No</source>
+        <translation>Ne</translation>
     </message>
     <message>
-      <source>Yes</source>
-      <translation>Ano</translation>
+        <source>Yes</source>
+        <translation>Ano</translation>
     </message>
     <message>
-      <source>Download to where</source>
-      <translation>Kam stáhnout</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>No packages selected</source>
+        <translation>Nebyl vybrán žádný balíček</translation>
     </message>
     <message>
-      <source>OK</source>
-      <translation>OK</translation>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-      <source>Do you wish to remove or reinstall
+        <source>Do you wish to remove or reinstall
 %1?</source>
-      <translation>Opravdu chcete odstranit, nebo přeinstalovat
+        <translation>Opravdu chcete odstranit, nebo přeinstalovat
 %1?</translation>
     </message>
     <message>
-      <source>Remove or ReInstall</source>
-      <translation>Odstranit, nebo přeinstalovat</translation>
+        <source>Remove or ReInstall</source>
+        <translation>Odstranit, nebo přeinstalovat</translation>
     </message>
     <message>
-      <source>ReInstall</source>
-      <translation>Přeinstalovat</translation>
+        <source>ReInstall</source>
+        <translation>Přeinstalovat</translation>
     </message>
     <message>
-      <source>Do you wish to remove or upgrade
+        <source>Do you wish to remove or upgrade
 %1?</source>
-      <translation>Opravdu chcete odstranit, nebo aktualizovat
+        <translation>Opravdu chcete odstranit, nebo aktualizovat
 %1?</translation>
     </message>
     <message>
-      <source>Remove or Upgrade</source>
-      <translation>Odstranit, nebo aktualizovat</translation>
+        <source>Remove or Upgrade</source>
+        <translation>Odstranit, nebo aktualizovat</translation>
     </message>
     <message>
-      <source>Updating Launcher...</source>
-      <translation>Aktualizuji spouštěč...</translation>
+        <source>Updating Launcher...</source>
+        <translation>Aktualizuji spouštěč...</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>PackageWindow</name>
     <message>
-      <source>&lt;b>Description&lt;/b> - </source>
-      <translation>&lt;b>Popis&lt;/b> - </translation>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation>&lt;b&gt;Popis&lt;/b&gt; - </translation>
     </message>
     <message>
-      <source>&lt;p>&lt;b>Installed To&lt;/b> - </source>
-      <translation>&lt;p>&lt;b>Instalováno na&lt;/b> - </translation>
+        <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>&lt;b>Size&lt;/b> - </source>
-      <translation>&lt;p>&lt;b>Velikost&lt;/b> - </translation>
+        <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>&lt;b>Section&lt;/b> - </source>
-      <translation>&lt;p>&lt;b>Sekce&lt;/b> - </translation>
+        <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>&lt;b>Filename&lt;/b> - </source>
-      <translation>&lt;p>&lt;b>Jméno souboru&lt;/b> - </translation>
+        <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>&lt;b>Version Installed&lt;/b> - </source>
-      <translation>&lt;p>&lt;b>Instalovaná verze&lt;/b> - </translation>
+        <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>&lt;b>Version Available&lt;/b> - </source>
-      <translation>&lt;p>&lt;b>Verze k dispozici&lt;/b> - </translation>
+        <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>
+        <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>
+        <source>Package information is unavailable</source>
+        <translation>Informace o balíčku není k dispozici</translation>
     </message>
     <message>
-      <source>Close</source>
-      <translation>Zavřít</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Installed packages</source>
-      <translation>Nainstalované balíčky</translation>
+        <source>Installed packages</source>
+        <translation>Nainstalované balíčky</translation>
     </message>
     <message>
-      <source>Local packages</source>
-      <translation>Lokální balíčky</translation>
+        <source>Local packages</source>
+        <translation>Lokální balíčky</translation>
     </message>
     <message>
-      <source>N/A</source>
-      <translation>N/A</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-      <source>Package - %1
+        <source>Package - %1
               version - %2</source>
-      <translation>Balíček - %1
+        <translation>Balíček - %1
               verze - %2</translation>
     </message>
     <message>
-      <source>
+        <source>
               inst version - %1</source>
-      <translation>
+        <translation>
               inst. verze - %1</translation>
     </message>
     <message>
-      <source>Version string is empty.</source>
-      <translation>Verze není uvedena.</translation>
+        <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>
+        <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>
+        <source>Nothing after colon in version number.</source>
+        <translation>Není nic po dvojtečce v čísle verze.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QuestionDlg</name>
     <message>
-      <source>Remove</source>
-      <translation>Odstranit</translation>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
-      <source>Configuration</source>
-      <translation>Konfigurace</translation>
+        <source>Configuration</source>
+        <translation>Konfigurace</translation>
     </message>
     <message>
-      <source>Servers</source>
-      <translation>Servery</translation>
+        <source>Servers</source>
+        <translation>Servery</translation>
     </message>
     <message>
-      <source>Destinations</source>
-      <translation>Cíle</translation>
+        <source>Destinations</source>
+        <translation>Cíle</translation>
     </message>
     <message>
-      <source>Proxies</source>
-      <translation>Proxy</translation>
+        <source>Proxies</source>
+        <translation>Proxy</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nový</translation>
+        <source>New</source>
+        <translation>Nový</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Server</source>
-      <translation>Server</translation>
+        <source>Server</source>
+        <translation>Server</translation>
     </message>
     <message>
-      <source>Name:</source>
-      <translation>Jméno:</translation>
+        <source>Name:</source>
+        <translation>Jméno:</translation>
     </message>
     <message>
-      <source>Address:</source>
-      <translation>Adresa:</translation>
+        <source>Address:</source>
+        <translation>Adresa:</translation>
     </message>
     <message>
-      <source>Active Server</source>
-      <translation>Aktivní server</translation>
+        <source>Active Server</source>
+        <translation>Aktivní server</translation>
     </message>
     <message>
-      <source>Update</source>
-      <translation>Obnovit</translation>
+        <source>Update</source>
+        <translation>Obnovit</translation>
     </message>
     <message>
-      <source>Destination</source>
-      <translation>Cíl</translation>
+        <source>Destination</source>
+        <translation>Cíl</translation>
     </message>
     <message>
-      <source>Location:</source>
-      <translation>Umístění:</translation>
+        <source>Location:</source>
+        <translation>Umístění:</translation>
     </message>
     <message>
-      <source>Link to root</source>
-      <translation>Link do rootu</translation>
+        <source>Link to root</source>
+        <translation>Link do rootu</translation>
     </message>
     <message>
-      <source>HTTP Proxy</source>
-      <translation>HTTP Proxy</translation>
+        <source>HTTP Proxy</source>
+        <translation>HTTP Proxy</translation>
     </message>
     <message>
-      <source>Enabled</source>
-      <translation>Zapnuto</translation>
+        <source>Enabled</source>
+        <translation>Zapnuto</translation>
     </message>
     <message>
-      <source>FTP Proxy</source>
-      <translation>FTP Proxy</translation>
+        <source>FTP Proxy</source>
+        <translation>FTP Proxy</translation>
     </message>
     <message>
-      <source>Username:</source>
-      <translation>Uživ. jméno:</translation>
+        <source>Username:</source>
+        <translation>Uživ. jméno:</translation>
     </message>
     <message>
-      <source>Password:</source>
-      <translation>Heslo:</translation>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/backup.ts b/i18n/cz/backup.ts
index cbbef00..602659d 100644
--- a/i18n/cz/backup.ts
+++ b/i18n/cz/backup.ts
@@ -1,133 +1,156 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>BackupAndRestore</name>
     <message>
-      <source>Backup and Restore... working...</source>
-      <translation>Backup and Restore... pracuje...</translation>
+        <source>Backup and Restore... working...</source>
+        <translation type="obsolete">Backup and Restore... pracuje...</translation>
     </message>
     <message>
-      <source>Error from System:
+        <source>Error from System:
 </source>
-      <translation>Chyba od systému:</translation>
+        <translation>Chyba od systému:</translation>
     </message>
     <message>
-      <source>Message</source>
-      <translation>Zpráva</translation>
+        <source>Message</source>
+        <translation>Zpráva</translation>
     </message>
     <message>
-      <source>Backup Failed!</source>
-      <translation>Zálohování selhalo!</translation>
+        <source>Backup Failed!</source>
+        <translation>Zálohování selhalo!</translation>
     </message>
     <message>
-      <source>Ok</source>
-      <translation>Ok</translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-      <source>Details</source>
-      <translation>Podrobnosti</translation>
+        <source>Details</source>
+        <translation>Podrobnosti</translation>
     </message>
     <message>
-      <source>Backup and Restore.. Failed !!</source>
-      <translation>Backup and Restore.. Se nezdařilo !!</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Restore Failed.</source>
+        <translation>Obnovení selhalo.</translation>
     </message>
     <message>
-      <source>Unable to open File: %1</source>
-      <translation>Nemohu otevřít soubor: %1</translation>
+        <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>
+        <source>Restore Successful.</source>
+        <translation>Obnovení proběhlo úspěšně.</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Backing up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Backup...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BackupAndRestoreBase</name>
     <message>
-      <source>Backup And Restore</source>
-      <translation>Backup And Restore</translation>
+        <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>Backup</source>
-      <translation>Zálohovat</translation>
+        <source>Restore</source>
+        <translation>Obnovit</translation>
     </message>
     <message>
-      <source>Save To</source>
-      <translation>Uložit jako</translation>
+        <source>Column 1</source>
+        <translation>Sloupec 1</translation>
     </message>
     <message>
-      <source>&amp;Backup</source>
-      <translation>&amp;Zálohovat</translation>
+        <source>&amp;Restore</source>
+        <translation>&amp;Obnovit</translation>
     </message>
     <message>
-      <source>Applications</source>
-      <translation>Aplikace</translation>
+        <source>Select Source</source>
+        <translation>Vyberte zdroj</translation>
     </message>
     <message>
-      <source>Restore</source>
-      <translation>Obnovit</translation>
+        <source>Locations</source>
+        <translation>Umístění</translation>
     </message>
     <message>
-      <source>Column 1</source>
-      <translation>Sloupec 1</translation>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
-      <source>&amp;Restore</source>
-      <translation>&amp;Obnovit</translation>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
     <message>
-      <source>Select Source</source>
-      <translation>Vyberte zdroj</translation>
+        <source>Save</source>
+        <translation>Uložit</translation>
     </message>
     <message>
-      <source>Locations</source>
-      <translation>Umístění</translation>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-      <source>Add</source>
-      <translation>Přidat</translation>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Remove</source>
-      <translation>Odstranit</translation>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Save</source>
-      <translation>Uložit</translation>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>...</source>
-      <translation>...</translation>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ErrorDialog</name>
     <message>
-      <source>Error Info</source>
-      <translation>Chybové informace</translation>
+        <source>Error Info</source>
+        <translation>Chybové informace</translation>
     </message>
     <message>
-      <source>Error Message:</source>
-      <translation>Chybová zpráva:</translation>
+        <source>Error Message:</source>
+        <translation>Chybová zpráva:</translation>
     </message>
     <message>
-      <source>&amp;OK</source>
-      <translation>&amp;OK</translation>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/bartender.ts b/i18n/cz/bartender.ts
index 682578a..c578fe9 100644
--- a/i18n/cz/bartender.ts
+++ b/i18n/cz/bartender.ts
@@ -1,170 +1,186 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>BacDialog</name>
     <message>
-      <source>Blood Alcohol Estimator</source>
-      <translation>Kalkulátor alkoholu v krvi</translation>
+        <source>Blood Alcohol Estimator</source>
+        <translation>Kalkulátor alkoholu v krvi</translation>
     </message>
     <message>
-      <source># Drinks Consumed</source>
-      <translation># konzumovaných nápojů</translation>
+        <source># Drinks Consumed</source>
+        <translation># konzumovaných nápojů</translation>
     </message>
     <message>
-      <source>Weight</source>
-      <translation>Váha</translation>
+        <source>Weight</source>
+        <translation>Váha</translation>
     </message>
     <message>
-      <source>Kilos</source>
-      <translation>Kilo</translation>
+        <source>Kilos</source>
+        <translation>Kilo</translation>
     </message>
     <message>
-      <source>Pounds</source>
-      <translation>Liber</translation>
+        <source>Pounds</source>
+        <translation>Liber</translation>
     </message>
     <message>
-      <source>Units</source>
-      <translation>Jednotek</translation>
+        <source>Units</source>
+        <translation>Jednotek</translation>
     </message>
     <message>
-      <source>Period of Time (hours)</source>
-      <translation>Doba (hodin)</translation>
+        <source>Period of Time (hours)</source>
+        <translation>Doba (hodin)</translation>
     </message>
     <message>
-      <source>Male</source>
-      <translation>Muž</translation>
+        <source>Male</source>
+        <translation>Muž</translation>
     </message>
     <message>
-      <source>Female</source>
-      <translation>Žena</translation>
+        <source>Female</source>
+        <translation>Žena</translation>
     </message>
     <message>
-      <source>Unknown</source>
-      <translation>Neznámý</translation>
+        <source>Unknown</source>
+        <translation>Neznámý</translation>
     </message>
     <message>
-      <source>Gender</source>
-      <translation>Pohlaví</translation>
+        <source>Gender</source>
+        <translation>Pohlaví</translation>
     </message>
     <message>
-      <source>Beer</source>
-      <translation>Pivo</translation>
+        <source>Beer</source>
+        <translation>Pivo</translation>
     </message>
     <message>
-      <source>Wine</source>
-      <translation>Víno</translation>
+        <source>Wine</source>
+        <translation>Víno</translation>
     </message>
     <message>
-      <source>Shot</source>
-      <translation>Panák</translation>
+        <source>Shot</source>
+        <translation>Panák</translation>
     </message>
     <message>
-      <source>Type of drink</source>
-      <translation>Typ nápoje</translation>
+        <source>Type of drink</source>
+        <translation>Typ nápoje</translation>
     </message>
     <message>
-      <source>Calculate</source>
-      <translation>Spočítat</translation>
+        <source>Calculate</source>
+        <translation>Spočítat</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Bartender</name>
     <message>
-      <source>Bartender</source>
-      <translation>Barman</translation>
+        <source>Bartender</source>
+        <translation>Barman</translation>
     </message>
     <message>
-      <source>File</source>
-      <translation>Soubor</translation>
+        <source>File</source>
+        <translation>Soubor</translation>
     </message>
     <message>
-      <source>New Drink</source>
-      <translation>Nový nápoj</translation>
+        <source>New Drink</source>
+        <translation>Nový nápoj</translation>
     </message>
     <message>
-      <source>Open Drink</source>
-      <translation>Otevřít nápoj</translation>
+        <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>
+        <source>Find by Drink Name</source>
+        <translation>Hledat dle názvu nápoje</translation>
     </message>
     <message>
-      <source>Find by Alcohol</source>
-      <translation>Hledat dle alkoholu</translation>
+        <source>Find by Alcohol</source>
+        <translation type="obsolete">Hledat dle alkoholu</translation>
     </message>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
     <message>
-      <source>edit</source>
-      <translation>upravit</translation>
+        <source>edit</source>
+        <translation type="obsolete">upravit</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nový</translation>
+        <source>New</source>
+        <translation>Nový</translation>
     </message>
     <message>
-      <source>Open</source>
-      <translation>Otevřít</translation>
+        <source>Open</source>
+        <translation>Otevřít</translation>
     </message>
     <message>
-      <source>Find</source>
-      <translation>Hledat</translation>
+        <source>Find</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Name of Drink</source>
-      <translation>Název nápoje</translation>
+        <source>Name of Drink</source>
+        <translation>Název nápoje</translation>
     </message>
     <message>
-      <source>Note</source>
-      <translation>Poznámka</translation>
+        <source>Note</source>
+        <translation>Poznámka</translation>
     </message>
     <message>
-      <source>Drink database not opened sucessfully.
+        <source>Drink database not opened sucessfully.
 </source>
-      <translation>Neúspěšné otevření databáze nápojů.</translation>
+        <translation>Neúspěšné otevření databáze nápojů.</translation>
     </message>
     <message>
-      <source>Search by drink name
+        <source>Search by drink name
 </source>
-      <translation>Hledat dle názvu nápoje</translation>
+        <translation>Hledat dle názvu nápoje</translation>
     </message>
     <message>
-      <source>Drink Name</source>
-      <translation>Název nápoje</translation>
+        <source>Drink Name</source>
+        <translation>Název nápoje</translation>
     </message>
     <message>
-      <source>Alcohol</source>
-      <translation>Alkohol</translation>
+        <source>Alcohol</source>
+        <translation type="obsolete">Alkohol</translation>
     </message>
     <message>
-      <source>Search</source>
-      <translation>Hledat</translation>
+        <source>Search</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Sorry no results for
+        <source>Sorry no results for
 </source>
-      <translation>Žádné výsledky pro</translation>
+        <translation>Žádné výsledky pro</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>New_Drink</name>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Ingredients</source>
-      <translation>Ingredience</translation>
+        <source>Ingredients</source>
+        <translation>Ingredience</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Show_Drink</name>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/bluetooth-manager.ts b/i18n/cz/bluetooth-manager.ts
index ee71879..b1fc96f 100644
--- a/i18n/cz/bluetooth-manager.ts
+++ b/i18n/cz/bluetooth-manager.ts
@@ -90,7 +90,7 @@
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
-        <translation>Základní konfigurace Bluetooth</translation>
+        <translation type="obsolete">Základní konfigurace Bluetooth</translation>
     </message>
     <message>
         <source>Default Passkey</source>
@@ -128,6 +128,10 @@
         <source>Status Label</source>
         <translation>Značka stavu</translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/cz/checkbook.ts b/i18n/cz/checkbook.ts
index 044bf1a..ea87e95 100644
--- a/i18n/cz/checkbook.ts
+++ b/i18n/cz/checkbook.ts
@@ -1,647 +1,646 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>Checkbook</name>
     <message>
-      <source>Checkbook</source>
-      <translation>Šeková knížka</translation>
+        <source>Checkbook</source>
+        <translation>Šeková knížka</translation>
     </message>
     <message>
-      <source>New checkbook</source>
-      <translation>nová knížka</translation>
+        <source>New checkbook</source>
+        <translation>nová knížka</translation>
     </message>
     <message>
-      <source>Info</source>
-      <translation>Info</translation>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
     <message>
-      <source>Transactions</source>
-      <translation>Transakce</translation>
+        <source>Transactions</source>
+        <translation>Transakce</translation>
     </message>
     <message>
-      <source>Charts</source>
-      <translation>Grafy</translation>
+        <source>Charts</source>
+        <translation>Grafy</translation>
     </message>
     <message>
-      <source>Password protect</source>
-      <translation>Ochrana heslem</translation>
+        <source>Password protect</source>
+        <translation>Ochrana heslem</translation>
     </message>
     <message>
-      <source>Click here to enable/disable password protection of this checkbook.</source>
-      <translation>Klikněte pro zapnutí/vypnutí ochrany heslem této knížky.</translation>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation>Klikněte pro zapnutí/vypnutí ochrany heslem této knížky.</translation>
     </message>
     <message>
-      <source>Name:</source>
-      <translation>Jméno:</translation>
+        <source>Name:</source>
+        <translation>Jméno:</translation>
     </message>
     <message>
-      <source>Enter name of checkbook here.</source>
-      <translation>Zadejte jméno šekové knížky.</translation>
+        <source>Enter name of checkbook here.</source>
+        <translation>Zadejte jméno šekové knížky.</translation>
     </message>
     <message>
-      <source>Type:</source>
-      <translation>Typ:</translation>
+        <source>Type:</source>
+        <translation>Typ:</translation>
     </message>
     <message>
-      <source>Select type of checkbook here.</source>
-      <translation>Vyberte typ šekové knížky.</translation>
+        <source>Select type of checkbook here.</source>
+        <translation>Vyberte typ šekové knížky.</translation>
     </message>
     <message>
-      <source>Bank:</source>
-      <translation>Banka:</translation>
+        <source>Bank:</source>
+        <translation>Banka:</translation>
     </message>
     <message>
-      <source>Enter name of the bank for this checkbook here.</source>
-      <translation>Zadejte název banky pro tuto knížku.</translation>
+        <source>Enter name of the bank for this checkbook here.</source>
+        <translation>Zadejte název banky pro tuto knížku.</translation>
     </message>
     <message>
-      <source>Account number:</source>
-      <translation>Číslo účtu:</translation>
+        <source>Account number:</source>
+        <translation>Číslo účtu:</translation>
     </message>
     <message>
-      <source>Enter account number for this checkbook here.</source>
-      <translation>Zadejte číslo účtu pro tuto šekovou knížku.</translation>
+        <source>Enter account number for this checkbook here.</source>
+        <translation>Zadejte číslo účtu pro tuto šekovou knížku.</translation>
     </message>
     <message>
-      <source>PIN number:</source>
-      <translation>Číslo PIN:</translation>
+        <source>PIN number:</source>
+        <translation>Číslo PIN:</translation>
     </message>
     <message>
-      <source>Enter PIN number for this checkbook here.</source>
-      <translation>Zadejte PIN pro tuto šekovou knížku.</translation>
+        <source>Enter PIN number for this checkbook here.</source>
+        <translation>Zadejte PIN pro tuto šekovou knížku.</translation>
     </message>
     <message>
-      <source>Starting balance:</source>
-      <translation>Počáteční bilance:</translation>
+        <source>Starting balance:</source>
+        <translation>Počáteční bilance:</translation>
     </message>
     <message>
-      <source>Enter the initial balance for this checkbook here.</source>
-      <translation>Zadejte počáteční bilanci pro tuto knížku.</translation>
+        <source>Enter the initial balance for this checkbook here.</source>
+        <translation>Zadejte počáteční bilanci pro tuto knížku.</translation>
     </message>
     <message>
-      <source>Notes:</source>
-      <translation>Poznámky:</translation>
+        <source>Notes:</source>
+        <translation>Poznámky:</translation>
     </message>
     <message>
-      <source>Enter any additional information for this checkbook here.</source>
-      <translation>Zadejte jakékoliv další informace pro tuto knížku.</translation>
+        <source>Enter any additional information for this checkbook here.</source>
+        <translation>Zadejte jakékoliv další informace pro tuto knížku.</translation>
     </message>
     <message>
-      <source>Sort by:</source>
-      <translation>Řadit podle:</translation>
+        <source>Sort by:</source>
+        <translation>Řadit podle:</translation>
     </message>
     <message>
-      <source>Select checkbook sorting here.</source>
-      <translation>Zde vyberete řazení v knížce.</translation>
+        <source>Select checkbook sorting here.</source>
+        <translation>Zde vyberete řazení v knížce.</translation>
     </message>
     <message>
-      <source>Entry Order</source>
-      <translation>Podle vstupu</translation>
+        <source>Entry Order</source>
+        <translation>Podle vstupu</translation>
     </message>
     <message>
-      <source>Date</source>
-      <translation>Datum</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-      <source>Number</source>
-      <translation>Číslo</translation>
+        <source>Number</source>
+        <translation>Číslo</translation>
     </message>
     <message>
-      <source>This is a listing of all transactions entered for this checkbook.
+        <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>Toto je výpis všech transakcí vložených do knížky.
+        <translation>Toto je výpis všech transakcí vložených do knížky.
 
 Pro seřazení položek klikněte na název příslušného sloupce.</translation>
     </message>
     <message>
-      <source>Id</source>
-      <translation>Id</translation>
+        <source>Id</source>
+        <translation>Id</translation>
     </message>
     <message>
-      <source>SortDate</source>
-      <translation>SortDatum</translation>
+        <source>SortDate</source>
+        <translation>SortDatum</translation>
     </message>
     <message>
-      <source>Num</source>
-      <translation>Číslo</translation>
+        <source>Num</source>
+        <translation>Číslo</translation>
     </message>
     <message>
-      <source>Description</source>
-      <translation>Popis</translation>
+        <source>Description</source>
+        <translation>Popis</translation>
     </message>
     <message>
-      <source>Amount</source>
-      <translation>Částka</translation>
+        <source>Amount</source>
+        <translation>Částka</translation>
     </message>
     <message>
-      <source>Balance</source>
-      <translation>Bilance</translation>
+        <source>Balance</source>
+        <translation>Bilance</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nová</translation>
+        <source>New</source>
+        <translation>Nová</translation>
     </message>
     <message>
-      <source>Click here to add a new transaction.</source>
-      <translation>Klikněte pro přidání nové transakce.</translation>
+        <source>Click here to add a new transaction.</source>
+        <translation>Klikněte pro přidání nové transakce.</translation>
     </message>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
     <message>
-      <source>Select a transaction and then click here to edit it.</source>
-      <translation>Označte transakci a klikněte sem pro úpravu.</translation>
+        <source>Select a transaction and then click here to edit it.</source>
+        <translation>Označte transakci a klikněte sem pro úpravu.</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Select a checkbook and then click here to delete it.</source>
-      <translation>Vyberte knížku a klikněte sem pro smazání.</translation>
+        <source>Select a checkbook and then click here to delete it.</source>
+        <translation>Vyberte knížku a klikněte sem pro smazání.</translation>
     </message>
     <message>
-      <source>Select the desired chart below and then click on the Draw button.</source>
-      <translation>Vyberte dole požadovaný graf a pak klikněte na tlačítko Vykreslit.</translation>
+        <source>Select the desired chart below and then click on the Draw button.</source>
+        <translation>Vyberte dole požadovaný graf a pak klikněte na tlačítko Vykreslit.</translation>
     </message>
     <message>
-      <source>Click here to select the desired chart type.</source>
-      <translation>Klikněte sem pro výběr požadovaného grafu.</translation>
+        <source>Click here to select the desired chart type.</source>
+        <translation>Klikněte sem pro výběr požadovaného grafu.</translation>
     </message>
     <message>
-      <source>Account balance</source>
-      <translation>Bilance účtu</translation>
+        <source>Account balance</source>
+        <translation>Bilance účtu</translation>
     </message>
     <message>
-      <source>Withdrawals by category</source>
-      <translation>Výběry dle kategorie</translation>
+        <source>Withdrawals by category</source>
+        <translation>Výběry dle kategorie</translation>
     </message>
     <message>
-      <source>Deposits by category</source>
-      <translation>Vklady dle kategorie</translation>
+        <source>Deposits by category</source>
+        <translation>Vklady dle kategorie</translation>
     </message>
     <message>
-      <source>Draw</source>
-      <translation>Vykreslit</translation>
+        <source>Draw</source>
+        <translation>Vykreslit</translation>
     </message>
     <message>
-      <source>Click here to draw the selected chart.</source>
-      <translation>Pro vykreslení grafu klikněte sem.</translation>
+        <source>Click here to draw the selected chart.</source>
+        <translation>Pro vykreslení grafu klikněte sem.</translation>
     </message>
     <message>
-      <source>Enter password</source>
-      <translation>Zadejte heslo</translation>
+        <source>Enter password</source>
+        <translation>Zadejte heslo</translation>
     </message>
     <message>
-      <source>Please enter your password:</source>
-      <translation>Prosím zadejte vaše heslo:</translation>
+        <source>Please enter your password:</source>
+        <translation>Prosím zadejte vaše heslo:</translation>
     </message>
     <message>
-      <source>Confirm password</source>
-      <translation>Potvrzení hesla</translation>
+        <source>Confirm password</source>
+        <translation>Potvrzení hesla</translation>
     </message>
     <message>
-      <source>Please confirm your password:</source>
-      <translation>Prosím potvrďte vaše heslo:</translation>
+        <source>Please confirm your password:</source>
+        <translation>Prosím potvrďte vaše heslo:</translation>
     </message>
     <message>
-      <source>Please enter your password to confirm removal of password protection:</source>
-      <translation>Prosím zadejte vaše heslo pro potvrzení odstranění ochrany heslem:</translation>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation>Prosím zadejte vaše heslo pro potvrzení odstranění ochrany heslem:</translation>
     </message>
     <message>
-      <source>Delete transaction</source>
-      <translation>Checkbook</translation>
+        <source>Delete transaction</source>
+        <translation>Checkbook</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Configuration</name>
     <message>
-      <source>Configure Checkbook</source>
-      <translation>Konfigurovat šekovou knížku</translation>
+        <source>Configure Checkbook</source>
+        <translation>Konfigurovat šekovou knížku</translation>
     </message>
     <message>
-      <source>&amp;Settings</source>
-      <translation>&amp;Nastavení</translation>
+        <source>&amp;Settings</source>
+        <translation>&amp;Nastavení</translation>
     </message>
     <message>
-      <source>Type</source>
-      <translation>Typ</translation>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-      <source>New Account Type</source>
-      <translation>Nový typ účtu</translation>
+        <source>New Account Type</source>
+        <translation>Nový typ účtu</translation>
     </message>
     <message>
-      <source>&amp;Account Types</source>
-      <translation>&amp;Typy účtů</translation>
+        <source>&amp;Account Types</source>
+        <translation>&amp;Typy účtů</translation>
     </message>
     <message>
-      <source>Category</source>
-      <translation>Kategorie</translation>
+        <source>Category</source>
+        <translation>Kategorie</translation>
     </message>
     <message>
-      <source>New Category</source>
-      <translation>Nová kategorie</translation>
+        <source>New Category</source>
+        <translation>Nová kategorie</translation>
     </message>
     <message>
-      <source>Expense</source>
-      <translation>Výdaj</translation>
+        <source>Expense</source>
+        <translation>Výdaj</translation>
     </message>
     <message>
-      <source>Income</source>
-      <translation>Výnos</translation>
+        <source>Income</source>
+        <translation>Výnos</translation>
     </message>
     <message>
-      <source>&amp;Categories</source>
-      <translation>&amp;Kategorie</translation>
+        <source>&amp;Categories</source>
+        <translation>&amp;Kategorie</translation>
     </message>
     <message>
-      <source>Payee</source>
-      <translation>Příjemce</translation>
+        <source>Payee</source>
+        <translation>Příjemce</translation>
     </message>
     <message>
-      <source>New Payee</source>
-      <translation>Nový příjemce</translation>
+        <source>New Payee</source>
+        <translation>Nový příjemce</translation>
     </message>
     <message>
-      <source>&amp;Payees</source>
-      <translation>&amp;Příjemci</translation>
+        <source>&amp;Payees</source>
+        <translation>&amp;Příjemci</translation>
     </message>
     <message>
-      <source>Enter currency symbol:</source>
-      <translation>Zadejte symbol měny:</translation>
+        <source>Enter currency symbol:</source>
+        <translation>Zadejte symbol měny:</translation>
     </message>
     <message>
-      <source>Enter your local currency symbol here.</source>
-      <translation>Sem zadejte symbol vaší měny.</translation>
+        <source>Enter your local currency symbol here.</source>
+        <translation>Sem zadejte symbol vaší měny.</translation>
     </message>
     <message>
-      <source>Show whether checkbook is password
+        <source>Show whether checkbook is password
 protected</source>
-      <translation>Ukázat, zda-li je šeková knížka chráněna
+        <translation>Ukázat, zda-li je šeková knížka chráněna
 heslem</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>Klikněte sem, zda-li hlavní okno má, či nemá zobrazovat, zda-li je šeková knížka chráněna heslem.</translation>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation>Klikněte sem, zda-li hlavní okno má, či nemá zobrazovat, zda-li je šeková knížka chráněna heslem.</translation>
     </message>
     <message>
-      <source>Show checkbook balances</source>
-      <translation>Ukázat bilance knížky</translation>
+        <source>Show checkbook balances</source>
+        <translation>Ukázat bilance knížky</translation>
     </message>
     <message>
-      <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-      <translation>Klikněte sem, zda-li hlavní okno má, či nemá zobrazovat momentální bilanci pro každou knížku.</translation>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation>Klikněte sem, zda-li hlavní okno má, či nemá zobrazovat momentální bilanci pro každou knížku.</translation>
     </message>
     <message>
-      <source>Open last checkbook</source>
-      <translation>Otevírat poslední knížku</translation>
+        <source>Open last checkbook</source>
+        <translation>Otevírat poslední knížku</translation>
     </message>
     <message>
-      <source>Click here to select whether the last open checkbook will be opened at startup.</source>
-      <translation>Klikněte sem pro výběr, zda-li se bude při spuštění otevírat naposledy otevřená knížka.</translation>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation>Klikněte sem pro výběr, zda-li se bude při spuštění otevírat naposledy otevřená knížka.</translation>
     </message>
     <message>
-      <source>Show last checkbook tab</source>
-      <translation>Ukázat poslední záložku v knížce</translation>
+        <source>Show last checkbook tab</source>
+        <translation>Ukázat poslední záložku v knížce</translation>
     </message>
     <message>
-      <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
-      <translation>Klikněte sem pro výběr, zda-li se bude zobrazovat poslední záložka v knížce.</translation>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation>Klikněte sem pro výběr, zda-li se bude zobrazovat poslední záložka v knížce.</translation>
     </message>
     <message>
-      <source>Save new description as payee</source>
-      <translation>Uložit nový popis jako příjemce</translation>
+        <source>Save new description as payee</source>
+        <translation>Uložit nový popis jako příjemce</translation>
     </message>
     <message>
-      <source>Click here to save new descriptions in the list of payess.</source>
-      <translation>Klikněte sem pro uložení nových popisů v seznamu příjemců.</translation>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation>Klikněte sem pro uložení nových popisů v seznamu příjemců.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ListEdit</name>
     <message>
-      <source>Add</source>
-      <translation>Přidat</translation>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
-      <source>Checkbook</source>
-      <translation>Checkbook</translation>
+        <source>Checkbook</source>
+        <translation>Checkbook</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nová</translation>
+        <source>New</source>
+        <translation>Nová</translation>
     </message>
     <message>
-      <source>Click here to create a new checkbook.
+        <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
-      <translation>Klikněte sem pro vytvoření nové šekové knížky.
+        <translation>Klikněte sem pro vytvoření nové šekové knížky.
 
 Můžete také vybrat Nová z menu Šeková knížka.</translation>
     </message>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
     <message>
-      <source>Select a checkbook and then click here to edit it.
+        <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>Vyberte šekovou knížku a potom klikněte sem pro její úpravu.
+        <translation>Vyberte šekovou knížku a potom klikněte sem pro její úpravu.
 
 Můžete také vybrat Upravit z menu Šeková knížka, nebo podržet ukazatel na názvu šekové knížky.</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Select a checkbook and then click here delete it.
+        <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
-      <translation>Vyberte šekovou knížku a klikněte sem pro její smazání.
+        <translation>Vyberte šekovou knížku a klikněte sem pro její smazání.
 
 Můžete také vybrat Smazat v menu Šeková knížka.</translation>
     </message>
     <message>
-      <source>Configure</source>
-      <translation>Konfigurovat</translation>
+        <source>Configure</source>
+        <translation>Konfigurovat</translation>
     </message>
     <message>
-      <source>Click here to configure this app.</source>
-      <translation>Klikněte sem pro nastavení této aplikace.</translation>
+        <source>Click here to configure this app.</source>
+        <translation>Klikněte sem pro nastavení této aplikace.</translation>
     </message>
     <message>
-      <source>This is a listing of all checkbooks currently available.</source>
-      <translation>Toto je výpis všech momentálně dostupných šekových knížek.</translation>
+        <source>This is a listing of all checkbooks currently available.</source>
+        <translation>Toto je výpis všech momentálně dostupných šekových knížek.</translation>
     </message>
     <message>
-      <source>Checkbook Name</source>
-      <translation>Název Šekové knížky</translation>
+        <source>Checkbook Name</source>
+        <translation>Název Šekové knížky</translation>
     </message>
     <message>
-      <source>Balance</source>
-      <translation>Bilance</translation>
+        <source>Balance</source>
+        <translation>Bilance</translation>
     </message>
     <message>
-      <source>Enter password</source>
-      <translation>Zadejte heslo</translation>
+        <source>Enter password</source>
+        <translation>Zadejte heslo</translation>
     </message>
     <message>
-      <source>Please enter your password:</source>
-      <translation>Prosím zadejte vaše heslo:</translation>
+        <source>Please enter your password:</source>
+        <translation>Prosím zadejte vaše heslo:</translation>
     </message>
     <message>
-      <source>Delete checkbook</source>
-      <translation>Smazat šekovou knížku</translation>
+        <source>Delete checkbook</source>
+        <translation>Smazat šekovou knížku</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QWidget</name>
     <message>
-      <source>Date</source>
-      <translation>Datum</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nový</translation>
+        <source>New</source>
+        <translation>Nový</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Savings</source>
-      <translation>Úspory</translation>
+        <source>Savings</source>
+        <translation>Úspory</translation>
     </message>
     <message>
-      <source>Checking</source>
-      <translation>Ověřování</translation>
+        <source>Checking</source>
+        <translation>Ověřování</translation>
     </message>
     <message>
-      <source>CD</source>
-      <translation>CD</translation>
+        <source>CD</source>
+        <translation>CD</translation>
     </message>
     <message>
-      <source>Money market</source>
-      <translation>Peněžní trh</translation>
+        <source>Money market</source>
+        <translation>Peněžní trh</translation>
     </message>
     <message>
-      <source>Mutual fund</source>
-      <translation>Podílový fond</translation>
+        <source>Mutual fund</source>
+        <translation>Podílový fond</translation>
     </message>
     <message>
-      <source>Other</source>
-      <translation>Jiný</translation>
+        <source>Other</source>
+        <translation>Jiný</translation>
     </message>
     <message>
-      <source>Expense</source>
-      <translation>Výdaj</translation>
+        <source>Expense</source>
+        <translation>Výdaj</translation>
     </message>
     <message>
-      <source>Automobile</source>
-      <translation>Automobil</translation>
+        <source>Automobile</source>
+        <translation>Automobil</translation>
     </message>
     <message>
-      <source>Bills</source>
-      <translation>Účtenky</translation>
+        <source>Bills</source>
+        <translation>Účtenky</translation>
     </message>
     <message>
-      <source>CDs</source>
-      <translation>CD nosiče</translation>
+        <source>CDs</source>
+        <translation>CD nosiče</translation>
     </message>
     <message>
-      <source>Clothing</source>
-      <translation>Oblečení</translation>
+        <source>Clothing</source>
+        <translation>Oblečení</translation>
     </message>
     <message>
-      <source>Computer</source>
-      <translation>Počítač</translation>
+        <source>Computer</source>
+        <translation>Počítač</translation>
     </message>
     <message>
-      <source>DVDs</source>
-      <translation>DVD nosiče</translation>
+        <source>DVDs</source>
+        <translation>DVD nosiče</translation>
     </message>
     <message>
-      <source>Electronics</source>
-      <translation>Elektronika</translation>
+        <source>Electronics</source>
+        <translation>Elektronika</translation>
     </message>
     <message>
-      <source>Entertainment</source>
-      <translation>Zábava</translation>
+        <source>Entertainment</source>
+        <translation>Zábava</translation>
     </message>
     <message>
-      <source>Food</source>
-      <translation>Jídlo</translation>
+        <source>Food</source>
+        <translation>Jídlo</translation>
     </message>
     <message>
-      <source>Gasoline</source>
-      <translation>Palivo</translation>
+        <source>Gasoline</source>
+        <translation>Palivo</translation>
     </message>
     <message>
-      <source>Misc</source>
-      <translation>Ostatní</translation>
+        <source>Misc</source>
+        <translation>Ostatní</translation>
     </message>
     <message>
-      <source>Movies</source>
-      <translation>Filmy</translation>
+        <source>Movies</source>
+        <translation>Filmy</translation>
     </message>
     <message>
-      <source>Rent</source>
-      <translation>Činže</translation>
+        <source>Rent</source>
+        <translation>Činže</translation>
     </message>
     <message>
-      <source>Travel</source>
-      <translation>Cestování</translation>
+        <source>Travel</source>
+        <translation>Cestování</translation>
     </message>
     <message>
-      <source>Income</source>
-      <translation>Plat</translation>
+        <source>Income</source>
+        <translation>Plat</translation>
     </message>
     <message>
-      <source>Work</source>
-      <translation>Zaměstnání</translation>
+        <source>Work</source>
+        <translation>Zaměstnání</translation>
     </message>
     <message>
-      <source>Family Member</source>
-      <translation>Člen rodiny</translation>
+        <source>Family Member</source>
+        <translation>Člen rodiny</translation>
     </message>
     <message>
-      <source>Misc. Credit</source>
-      <translation>Ostatní kredit</translation>
+        <source>Misc. Credit</source>
+        <translation>Ostatní kredit</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Transaction</name>
     <message>
-      <source>Transaction for </source>
-      <translation>Transakce pro</translation>
+        <source>Transaction for </source>
+        <translation>Transakce pro</translation>
     </message>
     <message>
-      <source>Withdrawal</source>
-      <translation>Výběr</translation>
+        <source>Withdrawal</source>
+        <translation>Výběr</translation>
     </message>
     <message>
-      <source>Select whether the transaction is a withdrawal or deposit here.</source>
-      <translation>Vyberte, zda-li se jedná o výběr či vklad.</translation>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <translation>Vyberte, zda-li se jedná o výběr či vklad.</translation>
     </message>
     <message>
-      <source>Deposit</source>
-      <translation>Vklad</translation>
+        <source>Deposit</source>
+        <translation>Vklad</translation>
     </message>
     <message>
-      <source>Date:</source>
-      <translation>Datum:</translation>
+        <source>Date:</source>
+        <translation>Datum:</translation>
     </message>
     <message>
-      <source>Select date of transaction here.</source>
-      <translation>Zde vyberete datum transakce.</translation>
+        <source>Select date of transaction here.</source>
+        <translation>Zde vyberete datum transakce.</translation>
     </message>
     <message>
-      <source>Number:</source>
-      <translation>Číslo:</translation>
+        <source>Number:</source>
+        <translation>Číslo:</translation>
     </message>
     <message>
-      <source>Enter check number here.</source>
-      <translation>Zde zadejte číslo paragonu.</translation>
+        <source>Enter check number here.</source>
+        <translation>Zde zadejte číslo paragonu.</translation>
     </message>
     <message>
-      <source>Description:</source>
-      <translation>Popis:</translation>
+        <source>Description:</source>
+        <translation>Popis:</translation>
     </message>
     <message>
-      <source>Enter description of transaction here.</source>
-      <translation>Zde zadejte popis transakce.</translation>
+        <source>Enter description of transaction here.</source>
+        <translation>Zde zadejte popis transakce.</translation>
     </message>
     <message>
-      <source>Category:</source>
-      <translation>Kategorie:</translation>
+        <source>Category:</source>
+        <translation>Kategorie:</translation>
     </message>
     <message>
-      <source>Select transaction category here.</source>
-      <translation>Zde vyberte kategorii transakce.</translation>
+        <source>Select transaction category here.</source>
+        <translation>Zde vyberte kategorii transakce.</translation>
     </message>
     <message>
-      <source>Type:</source>
-      <translation>Typ:</translation>
+        <source>Type:</source>
+        <translation>Typ:</translation>
     </message>
     <message>
-      <source>Select transaction type here.
+        <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-      <translation>Vyberte typ transakce.
+        <translation>Vyberte typ transakce.
 
 Možnosti se mění podle toho, jestli se jedná o výdej, nebo o vklad.</translation>
     </message>
     <message>
-      <source>Amount:</source>
-      <translation>Částka:</translation>
+        <source>Amount:</source>
+        <translation>Částka:</translation>
     </message>
     <message>
-      <source>Enter the amount of transaction here.
+        <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
-      <translation>Sem zadejte částku.
+        <translation>Sem zadejte částku.
 
 Hodnota by měla být vždy kladná.</translation>
     </message>
     <message>
-      <source>Fee:</source>
-      <translation>Poplatek:</translation>
+        <source>Fee:</source>
+        <translation>Poplatek:</translation>
     </message>
     <message>
-      <source>Enter any fee amount assoiciated with this transaction.
+        <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
-      <translation>Zadejte jakýkoliv poplatek vztahující se k transakci.
+        <translation>Zadejte jakýkoliv poplatek vztahující se k transakci.
 
 Hodnota by měla být vždy kladná.</translation>
     </message>
     <message>
-      <source>Notes:</source>
-      <translation>Poznámky:</translation>
+        <source>Notes:</source>
+        <translation>Poznámky:</translation>
     </message>
     <message>
-      <source>Enter any additional information for this transaction here.</source>
-      <translation>Zadejte jakékoliv další informace pro tuto transakci.</translation>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation>Zadejte jakékoliv další informace pro tuto transakci.</translation>
     </message>
     <message>
-      <source>Debit Charge</source>
-      <translation>Dlužní položka</translation>
+        <source>Debit Charge</source>
+        <translation>Dlužní položka</translation>
     </message>
     <message>
-      <source>Written Check</source>
-      <translation>Napsaný šek</translation>
+        <source>Written Check</source>
+        <translation>Napsaný šek</translation>
     </message>
     <message>
-      <source>Transfer</source>
-      <translation>Převod</translation>
+        <source>Transfer</source>
+        <translation>Převod</translation>
     </message>
     <message>
-      <source>Credit Card</source>
-      <translation>Kreditní karta</translation>
+        <source>Credit Card</source>
+        <translation>Kreditní karta</translation>
     </message>
     <message>
-      <source>Automatic Payment</source>
-      <translation>Automatická platba</translation>
+        <source>Automatic Payment</source>
+        <translation>Automatická platba</translation>
     </message>
     <message>
-      <source>Cash</source>
-      <translation>Hotovost</translation>
+        <source>Cash</source>
+        <translation>Hotovost</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/citytime.ts b/i18n/cz/citytime.ts
index 8a82f45..97b21cc 100644
--- a/i18n/cz/citytime.ts
+++ b/i18n/cz/citytime.ts
@@ -1,73 +1,71 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>CityTime</name>
     <message>
-      <source>Time Changing</source>
-      <translation>Změna času</translation>
+        <source>Time Changing</source>
+        <translation>Změna času</translation>
     </message>
     <message>
-      <source>There was a problem setting timezone %1</source>
-      <translation>Nastal problém s nastavením časové zóny %1</translation>
+        <source>There was a problem setting timezone %1</source>
+        <translation>Nastal problém s nastavením časové zóny %1</translation>
     </message>
     <message>
-      <source>Restore Time Zone</source>
-      <translation>Obnovení časové zóny</translation>
+        <source>Restore Time Zone</source>
+        <translation>Obnovení časové zóny</translation>
     </message>
     <message>
-      <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-      <translation>Nastal problém s nastavením časové zóny. Váš čas teď může jít špatně...</translation>
+        <source>There was a problem setting your timezone.Your time may be wrong now...</source>
+        <translation>Nastal problém s nastavením časové zóny. Váš čas teď může jít špatně...</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CityTimeBase</name>
     <message>
-      <source>City Time</source>
-      <translation>City Time</translation>
+        <source>City Time</source>
+        <translation>City Time</translation>
     </message>
     <message>
-      <source>Click on one of the set cities to replace it</source>
-      <translation>Klikněte na jedno z měst pro jeho nahrazení</translation>
+        <source>Click on one of the set cities to replace it</source>
+        <translation>Klikněte na jedno z měst pro jeho nahrazení</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ZoneMap</name>
     <message>
-      <source>CITY</source>
-      <translation>Město</translation>
+        <source>CITY</source>
+        <translation>Město</translation>
     </message>
     <message>
-      <source>Unable to Find Timezone Info</source>
-      <translation>Nelze nalézt informaci o časové zóně</translation>
+        <source>Unable to Find Timezone Info</source>
+        <translation>Nelze nalézt informaci o časové zóně</translation>
     </message>
     <message>
-      <source>&lt;p>Unable to find any timezone information in %1</source>
-      <translation>&lt;p>Nelze nalézt žádnou informaci o časové zóně v %1</translation>
+        <source>&lt;p&gt;Unable to find any timezone information in %1</source>
+        <translation>&lt;p&gt;Nelze nalézt žádnou informaci o časové zóně v %1</translation>
     </message>
     <message>
-      <source>Continent</source>
-      <translation>Kontinent</translation>
+        <source>Continent</source>
+        <translation>Kontinent</translation>
     </message>
     <message>
-      <source>Select a continent/country here, then select a city</source>
-      <translation>Zde vyberte kontinent/zemi a potom vyberte město</translation>
+        <source>Select a continent/country here, then select a city</source>
+        <translation>Zde vyberte kontinent/zemi a potom vyberte město</translation>
     </message>
     <message>
-      <source>City</source>
-      <translation>Město</translation>
+        <source>City</source>
+        <translation>Město</translation>
     </message>
     <message>
-      <source>Couldn't Find Map</source>
-      <translation>Nelze nalézt mapu</translation>
+        <source>Couldn&apos;t Find Map</source>
+        <translation>Nelze nalézt mapu</translation>
     </message>
     <message>
-      <source>&lt;p>Couldn't load map: %1, exiting</source>
-      <translation>&lt;p>Nelze otevřít mapu: %1, ukončuji</translation>
+        <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
+        <translation>&lt;p&gt;Nelze otevřít mapu: %1, ukončuji</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/clock.ts b/i18n/cz/clock.ts
index 85cb34e..5ac3b0e 100644
--- a/i18n/cz/clock.ts
+++ b/i18n/cz/clock.ts
@@ -1,209 +1,208 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>AlarmDlg</name>
     <message>
-      <source>Clock</source>
-      <translation>Hodiny</translation>
+        <source>Clock</source>
+        <translation>Hodiny</translation>
     </message>
     <message>
-      <source>Snooze</source>
-      <translation>Zdřímnout is</translation>
+        <source>Snooze</source>
+        <translation>Zdřímnout is</translation>
     </message>
     <message>
-      <source>Close</source>
-      <translation>Zavřít</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>AlarmDlgBase</name>
     <message>
-      <source>Form1</source>
-      <translation>Formulář 1</translation>
+        <source>Form1</source>
+        <translation>Formulář 1</translation>
     </message>
     <message>
-      <source>TextLabel1</source>
-      <translation>Popisek 1</translation>
+        <source>TextLabel1</source>
+        <translation>Popisek 1</translation>
     </message>
     <message>
-      <source>Snooze</source>
-      <translation>Zdřímnout is</translation>
+        <source>Snooze</source>
+        <translation>Zdřímnout is</translation>
     </message>
     <message>
-      <source> mins</source>
-      <translation> minut</translation>
+        <source> mins</source>
+        <translation> minut</translation>
     </message>
     <message>
-      <source>Close</source>
-      <translation>Zavřít</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Clock</name>
     <message>
-      <source>Start</source>
-      <translation>Start</translation>
+        <source>Start</source>
+        <translation>Start</translation>
     </message>
     <message>
-      <source>Reset</source>
-      <translation>Reset</translation>
+        <source>Reset</source>
+        <translation>Reset</translation>
     </message>
     <message>
-      <source>Stop</source>
-      <translation>Stop</translation>
+        <source>Stop</source>
+        <translation>Stop</translation>
     </message>
     <message>
-      <source>Mon</source>
-      <comment>Monday</comment>
-      <translation>Pon</translation>
+        <source>Mon</source>
+        <comment>Monday</comment>
+        <translation>Pon</translation>
     </message>
     <message>
-      <source>Tue</source>
-      <comment>Tuesday</comment>
-      <translation>Úte</translation>
+        <source>Tue</source>
+        <comment>Tuesday</comment>
+        <translation>Úte</translation>
     </message>
     <message>
-      <source>Wed</source>
-      <comment>Wednesday</comment>
-      <translation>Stř</translation>
+        <source>Wed</source>
+        <comment>Wednesday</comment>
+        <translation>Stř</translation>
     </message>
     <message>
-      <source>Thu</source>
-      <comment>Thursday</comment>
-      <translation>Čtv</translation>
+        <source>Thu</source>
+        <comment>Thursday</comment>
+        <translation>Čtv</translation>
     </message>
     <message>
-      <source>Fri</source>
-      <comment>Friday</comment>
-      <translation>Pát</translation>
+        <source>Fri</source>
+        <comment>Friday</comment>
+        <translation>Pát</translation>
     </message>
     <message>
-      <source>Sat</source>
-      <comment>Saturday</comment>
-      <translation>Sob</translation>
+        <source>Sat</source>
+        <comment>Saturday</comment>
+        <translation>Sob</translation>
     </message>
     <message>
-      <source>Sun</source>
-      <comment>Sunday</comment>
-      <translation>Neď</translation>
+        <source>Sun</source>
+        <comment>Sunday</comment>
+        <translation>Neď</translation>
     </message>
     <message>
-      <source>Lap/Split</source>
-      <translation>Kolo/Split</translation>
+        <source>Lap/Split</source>
+        <translation>Kolo/Split</translation>
     </message>
     <message>
-      <source>&lt;b>Daily Alarm:&lt;/b>&lt;p></source>
-      <translation>&lt;b>Denní Alarm:&lt;/b>&lt;p></translation>
+        <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
+        <translation>&lt;b&gt;Denní Alarm:&lt;/b&gt;&lt;p&gt;</translation>
     </message>
     <message>
-      <source>Select Day</source>
-      <translation>Vyberte den</translation>
+        <source>Select Day</source>
+        <translation>Vyberte den</translation>
     </message>
     <message>
-      <source>Daily alarm requires at least
+        <source>Daily alarm requires at least
 one day to be selected.</source>
-      <translation>Denní alarm vyžaduje vybrat 
+        <translation>Denní alarm vyžaduje vybrat 
 alespoň jeden den.
 </translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Vše</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-      <source>Audio</source>
-      <translation>Zvuk</translation>
+        <source>Audio</source>
+        <translation>Zvuk</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ClockBase</name>
     <message>
-      <source>Clock</source>
-      <translation>Hodiny</translation>
+        <source>Clock</source>
+        <translation>Hodiny</translation>
     </message>
     <message>
-      <source>...</source>
-      <translation>...</translation>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-      <source>Stopwatch</source>
-      <translation>Stopky</translation>
+        <source>Stopwatch</source>
+        <translation>Stopky</translation>
     </message>
     <message>
-      <source>Split</source>
-      <translation>Split</translation>
+        <source>Split</source>
+        <translation>Split</translation>
     </message>
     <message>
-      <source>Lap</source>
-      <translation>Kolo</translation>
+        <source>Lap</source>
+        <translation>Kolo</translation>
     </message>
     <message>
-      <source>Start</source>
-      <translation>Start</translation>
+        <source>Start</source>
+        <translation>Start</translation>
     </message>
     <message>
-      <source>Starts and stops the stopwatch.</source>
-      <translation>Spustí a zastaví stopky.</translation>
+        <source>Starts and stops the stopwatch.</source>
+        <translation>Spustí a zastaví stopky.</translation>
     </message>
     <message>
-      <source>Lap/Split</source>
-      <translation>Kolo/Split</translation>
+        <source>Lap/Split</source>
+        <translation>Kolo/Split</translation>
     </message>
     <message>
-      <source>Resets the stopwatch.</source>
-      <translation>Vynuluje stopky.</translation>
+        <source>Resets the stopwatch.</source>
+        <translation>Vynuluje stopky.</translation>
     </message>
     <message>
-      <source>Alarm</source>
-      <translation>Alarm</translation>
+        <source>Alarm</source>
+        <translation>Alarm</translation>
     </message>
     <message>
-      <source>Daily Alarm</source>
-      <translation>Denní alarm</translation>
+        <source>Daily Alarm</source>
+        <translation>Denní alarm</translation>
     </message>
     <message>
-      <source>Enabled</source>
-      <translation>Zapnutý</translation>
+        <source>Enabled</source>
+        <translation>Zapnutý</translation>
     </message>
     <message>
-      <source>Check to enable the daily alarm</source>
-      <translation>Zaškrtněte pro aktivaci denního alarmu</translation>
+        <source>Check to enable the daily alarm</source>
+        <translation>Zaškrtněte pro aktivaci denního alarmu</translation>
     </message>
     <message>
-      <source>Set the hour the alarm will sound.</source>
-      <translation>Nastavte hodinu spuštění alarmu.</translation>
+        <source>Set the hour the alarm will sound.</source>
+        <translation>Nastavte hodinu spuštění alarmu.</translation>
     </message>
     <message>
-      <source>:</source>
-      <translation>:</translation>
+        <source>:</source>
+        <translation>:</translation>
     </message>
     <message>
-      <source>Set the minute the alarm will sound.</source>
-      <translation>Nastavte minutu spuštění alarmu.</translation>
+        <source>Set the minute the alarm will sound.</source>
+        <translation>Nastavte minutu spuštění alarmu.</translation>
     </message>
     <message>
-      <source>AM</source>
-      <translation>AM</translation>
+        <source>AM</source>
+        <translation>AM</translation>
     </message>
     <message>
-      <source>PM</source>
-      <translation>PM</translation>
+        <source>PM</source>
+        <translation>PM</translation>
     </message>
     <message>
-      <source>Days:</source>
-      <translation>Dny:</translation>
+        <source>Days:</source>
+        <translation>Dny:</translation>
     </message>
     <message>
-      <source>Countdown Alarm</source>
-      <translation>Odečítací alarm</translation>
+        <source>Countdown Alarm</source>
+        <translation>Odečítací alarm</translation>
     </message>
     <message>
-      <source>Play Sound</source>
-      <translation>Zahrát zvuk</translation>
+        <source>Play Sound</source>
+        <translation>Zahrát zvuk</translation>
     </message>
     <message>
-      <source>Play File</source>
-      <translation>Zahrát soubor</translation>
+        <source>Play File</source>
+        <translation>Zahrát soubor</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/dagger.ts b/i18n/cz/dagger.ts
index ebd96cc..adf3cf5 100644
--- a/i18n/cz/dagger.ts
+++ b/i18n/cz/dagger.ts
@@ -1,282 +1,289 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>ConfigureDlg</name>
     <message>
-      <source>Configure Dagger</source>
-      <translation>Konfigurovat Dýku</translation>
+        <source>Configure Dagger</source>
+        <translation>Konfigurovat Dýku</translation>
     </message>
     <message>
-      <source>Path where Sword texts are located:</source>
-      <translation>Cesta, kde se nacházejí mečové texty:</translation>
+        <source>Path where Sword texts are located:</source>
+        <translation>Cesta, kde se nacházejí mečové texty:</translation>
     </message>
     <message>
-      <source>Enter the path where the Sword modules (Bible texts, commentaries, etc.) can be found.  This path should contain either the 'mods.conf' file or 'mods.d' sub-directory.</source>
-      <translation>Zadejte cestu, kde mohou být nalezeny mečové moduly (Biblické texty, kometáře, atd.).Tato cesta by měla obsahovat také soubor 'mods.conf', nebo 'mods.d' podadresář.</translation>
+        <source>Enter the path where the Sword modules (Bible texts, commentaries, etc.) can be found.  This path should contain either the &apos;mods.conf&apos; file or &apos;mods.d&apos; sub-directory.</source>
+        <translation>Zadejte cestu, kde mohou být nalezeny mečové moduly (Biblické texty, kometáře, atd.).Tato cesta by měla obsahovat také soubor &apos;mods.conf&apos;, nebo &apos;mods.d&apos; podadresář.</translation>
     </message>
     <message>
-      <source>Enter the path where the Sword texts (Bibles, commentaries, etc.) can be found.  This path should contain either the 'mods.conf' file or 'mods.d' sub-directory.</source>
-      <translation>Zadejte cestu, kde mohou být nalezeny mečové texty (Biblické texty, kometáře, atd.).Tato cesta by měla obsahovat také soubor 'mods.conf', nebo 'mods.d' podadresář.</translation>
+        <source>Enter the path where the Sword texts (Bibles, commentaries, etc.) can be found.  This path should contain either the &apos;mods.conf&apos; file or &apos;mods.d&apos; sub-directory.</source>
+        <translation>Zadejte cestu, kde mohou být nalezeny mečové texty (Biblické texty, kometáře, atd.).Tato cesta by měla obsahovat také soubor &apos;mods.conf&apos;, nebo &apos;mods.d&apos; podadresář.</translation>
     </message>
     <message>
-      <source>Tap here to select the path where the Sword texts (Bibles, commentaries, etc.) can be found.  This path should contain either the 'mods.conf' file or 'mods.d' sub-directory.</source>
-      <translation>Klikněte sem pro výběr cesty, kde mohou být nalezeny mečové texty (Biblické texty, kometáře, atd.).Tato cesta by měla obsahovat také soubor 'mods.conf', nebo 'mods.d' podadresář.</translation>
+        <source>Tap here to select the path where the Sword texts (Bibles, commentaries, etc.) can be found.  This path should contain either the &apos;mods.conf&apos; file or &apos;mods.d&apos; sub-directory.</source>
+        <translation>Klikněte sem pro výběr cesty, kde mohou být nalezeny mečové texty (Biblické texty, kometáře, atd.).Tato cesta by měla obsahovat také soubor &apos;mods.conf&apos;, nebo &apos;mods.d&apos; podadresář.</translation>
     </message>
     <message>
-      <source>(Note: Dagger must be restarted for this option to take affect.)</source>
-      <translation>(Upozornění: Dýka musí být restartována pro aplikaci této volby.)</translation>
+        <source>(Note: Dagger must be restarted for this option to take affect.)</source>
+        <translation>(Upozornění: Dýka musí být restartována pro aplikaci této volby.)</translation>
     </message>
     <message>
-      <source>Always open texts in new window?</source>
-      <translation>Otevírat texty vždy v novém okně?</translation>
+        <source>Always open texts in new window?</source>
+        <translation>Otevírat texty vždy v novém okně?</translation>
     </message>
     <message>
-      <source>Tap here to always open texts in a new window.  If this option is not selected, only one copy of a Sword text will be opened.</source>
-      <translation>Klikněte sem pro otevírání textů vždy v novém okně. Pokud není tato volba vybrána, bude otevřena pouze jedna kopie mečového textu.</translation>
+        <source>Tap here to always open texts in a new window.  If this option is not selected, only one copy of a Sword text will be opened.</source>
+        <translation>Klikněte sem pro otevírání textů vždy v novém okně. Pokud není tato volba vybrána, bude otevřena pouze jedna kopie mečového textu.</translation>
     </message>
     <message>
-      <source>Number of verses to display at a time:</source>
-      <translation>Počet verzí zobrazených najednou:</translation>
+        <source>Number of verses to display at a time:</source>
+        <translation>Počet verzí zobrazených najednou:</translation>
     </message>
     <message>
-      <source>Enter the number of verses to display at a time.  This also affects how far the scroll to previous/next page buttons on the Navigation bar scroll.</source>
-      <translation>Zadejte počet verzí zobrazených najednou. Toto také ovlivní tlačítka skrolování na předchozí/další stranu na navigační liště.</translation>
+        <source>Enter the number of verses to display at a time.  This also affects how far the scroll to previous/next page buttons on the Navigation bar scroll.</source>
+        <translation>Zadejte počet verzí zobrazených najednou. Toto také ovlivní tlačítka skrolování na předchozí/další stranu na navigační liště.</translation>
     </message>
     <message>
-      <source>Disable automatic screen power-down?</source>
-      <translation>Vypnout automatické vypnutí obrazovky?</translation>
+        <source>Disable automatic screen power-down?</source>
+        <translation>Vypnout automatické vypnutí obrazovky?</translation>
     </message>
     <message>
-      <source>Tap here to disable Opie's automatic power management feature which will dim and turn off the screen after a specified time.  This will only be effective while Dagger is running.</source>
-      <translation>Klikněte sem pro vypnutí automatického zhasínání a vypínání displeje po určitém čase systému Opie. Toto bude aktivní pouze pokud poběží Dýka.</translation>
+        <source>Tap here to disable Opie&apos;s automatic power management feature which will dim and turn off the screen after a specified time.  This will only be effective while Dagger is running.</source>
+        <translation>Klikněte sem pro vypnutí automatického zhasínání a vypínání displeje po určitém čase systému Opie. Toto bude aktivní pouze pokud poběží Dýka.</translation>
     </message>
     <message>
-      <source>General</source>
-      <translation>Hlavní</translation>
+        <source>General</source>
+        <translation>Hlavní</translation>
     </message>
     <message>
-      <source>Select the format used when copying the current verse to the clipboard.</source>
-      <translation>Vyberte formát používaný při kopírování aktuální verze do schránky.</translation>
+        <source>Select the format used when copying the current verse to the clipboard.</source>
+        <translation>Vyberte formát používaný při kopírování aktuální verze do schránky.</translation>
     </message>
     <message>
-      <source>Select copy format</source>
-      <translation>Vyberte formát kopírování</translation>
+        <source>Select copy format</source>
+        <translation>Vyberte formát kopírování</translation>
     </message>
     <message>
-      <source>&quot;Verse (Book cc:vv, text)&quot;</source>
-      <translation>&quot;Verze (Book cc:vv, text)&quot;</translation>
+        <source>&quot;Verse (Book cc:vv, text)&quot;</source>
+        <translation>&quot;Verze (Book cc:vv, text)&quot;</translation>
     </message>
     <message>
-      <source>&quot;Verse (Book cc:vv)&quot;</source>
-      <translation>&quot;Verze (Book cc:vv)&quot;</translation>
+        <source>&quot;Verse (Book cc:vv)&quot;</source>
+        <translation>&quot;Verze (Book cc:vv)&quot;</translation>
     </message>
     <message>
-      <source>&quot;Verse&quot;</source>
-      <translation>&quot;Verze&quot;</translation>
+        <source>&quot;Verse&quot;</source>
+        <translation>&quot;Verze&quot;</translation>
     </message>
     <message>
-      <source>&quot;Book cc:vv&quot;</source>
-      <translation>&quot;Book cc:vv&quot;</translation>
+        <source>&quot;Book cc:vv&quot;</source>
+        <translation>&quot;Book cc:vv&quot;</translation>
     </message>
     <message>
-      <source>Example:</source>
-      <translation>Příklad:</translation>
+        <source>Example:</source>
+        <translation>Příklad:</translation>
     </message>
     <message>
-      <source>Copy</source>
-      <translation>Kopírovat</translation>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
     </message>
     <message>
-      <source>Select the font, style and size used for displaying texts.</source>
-      <translation>Vyberte písmo, styl a velikost používanou pro zobrazování textů.</translation>
+        <source>Select the font, style and size used for displaying texts.</source>
+        <translation>Vyberte písmo, styl a velikost používanou pro zobrazování textů.</translation>
     </message>
     <message>
-      <source>Font</source>
-      <translation>Písmo</translation>
+        <source>Font</source>
+        <translation>Písmo</translation>
     </message>
     <message>
-      <source>KJV</source>
-      <translation>KJV</translation>
+        <source>KJV</source>
+        <translation>KJV</translation>
     </message>
     <message>
-      <source>In the beginning God created the heaven and the earth.</source>
-      <translation>Na začátku Bůh vytvořil nebe a Zemi.</translation>
+        <source>In the beginning God created the heaven and the earth.</source>
+        <translation>Na začátku Bůh vytvořil nebe a Zemi.</translation>
     </message>
     <message>
-      <source>Gen 1:1</source>
-      <translation>Gen 1:1</translation>
+        <source>Gen 1:1</source>
+        <translation>Gen 1:1</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
-      <source>Dagger</source>
-      <translation>Dýka</translation>
+        <source>Dagger</source>
+        <translation>Dýka</translation>
     </message>
     <message>
-      <source>Open...</source>
-      <translation>Otevřít...</translation>
+        <source>Open...</source>
+        <translation>Otevřít...</translation>
     </message>
     <message>
-      <source>Close</source>
-      <translation>Zavřít</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
     <message>
-      <source>Install...</source>
-      <translation>Instalovat...</translation>
+        <source>Install...</source>
+        <translation>Instalovat...</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Copy</source>
-      <translation>Kopírovat</translation>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
     </message>
     <message>
-      <source>Configure...</source>
-      <translation>Konfigurovat...</translation>
+        <source>Configure...</source>
+        <translation>Konfigurovat...</translation>
     </message>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
     <message>
-      <source>Add</source>
-      <translation>Přidat</translation>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
-      <source>Remove</source>
-      <translation>Odstranit</translation>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
     <message>
-      <source>Bookmark</source>
-      <translation>Záložka</translation>
+        <source>Bookmark</source>
+        <translation>Záložka</translation>
     </message>
     <message>
-      <source>Navigation toolbar</source>
-      <translation>Navigační lišta</translation>
+        <source>Navigation toolbar</source>
+        <translation>Navigační lišta</translation>
     </message>
     <message>
-      <source>Search toolbar</source>
-      <translation>Hledací lišta</translation>
+        <source>Search toolbar</source>
+        <translation>Hledací lišta</translation>
     </message>
     <message>
-      <source>View</source>
-      <translation>Zobrazit</translation>
+        <source>View</source>
+        <translation>Zobrazit</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NavBar</name>
     <message>
-      <source>Previous page</source>
-      <translation>Předchozí strana</translation>
+        <source>Previous page</source>
+        <translation>Předchozí strana</translation>
     </message>
     <message>
-      <source>Tap here to scroll backward one page.</source>
-      <translation>Klikněte sem pro přesun zpět o jednu stranu.</translation>
+        <source>Tap here to scroll backward one page.</source>
+        <translation>Klikněte sem pro přesun zpět o jednu stranu.</translation>
     </message>
     <message>
-      <source>Previous verse</source>
-      <translation>Předchozí verze</translation>
+        <source>Previous verse</source>
+        <translation>Předchozí verze</translation>
     </message>
     <message>
-      <source>Tap here to scroll backward one verse.</source>
-      <translation>Klikněte sem pro přesun zpět o jednu verzi.</translation>
+        <source>Tap here to scroll backward one verse.</source>
+        <translation>Klikněte sem pro přesun zpět o jednu verzi.</translation>
     </message>
     <message>
-      <source>Enter location to display here.</source>
-      <translation>Zadejte umístění, které chcete zobrazit.</translation>
+        <source>Enter location to display here.</source>
+        <translation>Zadejte umístění, které chcete zobrazit.</translation>
     </message>
     <message>
-      <source>Next verse</source>
-      <translation>Další verze</translation>
+        <source>Next verse</source>
+        <translation>Další verze</translation>
     </message>
     <message>
-      <source>Tap here to scroll forward one verse.</source>
-      <translation>Klikněte sem pro přesun na další verzi.</translation>
+        <source>Tap here to scroll forward one verse.</source>
+        <translation>Klikněte sem pro přesun na další verzi.</translation>
     </message>
     <message>
-      <source>Next page</source>
-      <translation>Další strana</translation>
+        <source>Next page</source>
+        <translation>Další strana</translation>
     </message>
     <message>
-      <source>Tap here to scroll forward one page.</source>
-      <translation>Klikněte sem pro přesun na další stranu.</translation>
+        <source>Tap here to scroll forward one page.</source>
+        <translation>Klikněte sem pro přesun na další stranu.</translation>
     </message>
     <message>
-      <source>Adjust auto-scroll rate here.  A larger value represents a slower scrolling rate.</source>
-      <translation>Nastavte hodnotu auto-scrollu. Větší hodnota reprezentuje pomalejší rolování.</translation>
+        <source>Adjust auto-scroll rate here.  A larger value represents a slower scrolling rate.</source>
+        <translation>Nastavte hodnotu auto-scrollu. Větší hodnota reprezentuje pomalejší rolování.</translation>
     </message>
     <message>
-      <source>Auto-scroll</source>
-      <translation>Auto-scroll</translation>
+        <source>Auto-scroll</source>
+        <translation>Auto-scroll</translation>
     </message>
     <message>
-      <source>Tap here to start or stop auto-scrolling.</source>
-      <translation>Klikněte sem pro spuštění, nebo zastavení automatického posuvu.</translation>
+        <source>Tap here to start or stop auto-scrolling.</source>
+        <translation>Klikněte sem pro spuštění, nebo zastavení automatického posuvu.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>OpenTextDlg</name>
     <message>
-      <source>Open text</source>
-      <translation>Otevřít text</translation>
+        <source>Open text</source>
+        <translation>Otevřít text</translation>
     </message>
     <message>
-      <source>Icon</source>
-      <translation>Ikona</translation>
+        <source>Icon</source>
+        <translation>Ikona</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Commentaries</source>
-      <translation>Komentáře</translation>
+        <source>Commentaries</source>
+        <translation>Komentáře</translation>
     </message>
     <message>
-      <source>Lexicons/Dictionaries</source>
-      <translation>Lexikony/Slovníky</translation>
+        <source>Lexicons/Dictionaries</source>
+        <translation>Lexikony/Slovníky</translation>
     </message>
     <message>
-      <source>Biblical Texts</source>
-      <translation>Biblické texty</translation>
+        <source>Biblical Texts</source>
+        <translation>Biblické texty</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SearchBar</name>
     <message>
-      <source>Enter text to search for here.</source>
-      <translation>Sem zadejte text, který chcete hledat.</translation>
+        <source>Enter text to search for here.</source>
+        <translation>Sem zadejte text, který chcete hledat.</translation>
     </message>
     <message>
-      <source>Find</source>
-      <translation>Hledat</translation>
+        <source>Find</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Tap here search the current module for the text entered to the left.</source>
-      <translation>Klikněte sem pro hledání aktuálního modulu pro text vležený vlevo.</translation>
+        <source>Tap here search the current module for the text entered to the left.</source>
+        <translation>Klikněte sem pro hledání aktuálního modulu pro text vležený vlevo.</translation>
     </message>
     <message>
-      <source>Previous result</source>
-      <translation>Předchozí výsledek</translation>
+        <source>Previous result</source>
+        <translation>Předchozí výsledek</translation>
     </message>
     <message>
-      <source>Tap here to view the previous search result.</source>
-      <translation>Klikněte sem pro zobrazení předchozího výsledku.</translation>
+        <source>Tap here to view the previous search result.</source>
+        <translation>Klikněte sem pro zobrazení předchozího výsledku.</translation>
     </message>
     <message>
-      <source>Select the desired search result here.</source>
-      <translation>Zde vyberte požadovaný výsledek hledání.</translation>
+        <source>Select the desired search result here.</source>
+        <translation>Zde vyberte požadovaný výsledek hledání.</translation>
     </message>
     <message>
-      <source>Next result</source>
-      <translation>Další výsledek</translation>
+        <source>Next result</source>
+        <translation>Další výsledek</translation>
     </message>
     <message>
-      <source>Tap here to view the next search result.</source>
-      <translation>Klikněte sem pro zobrazení dalšího výsledku hledání.</translation>
+        <source>Tap here to view the next search result.</source>
+        <translation>Klikněte sem pro zobrazení dalšího výsledku hledání.</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/doctab.ts b/i18n/cz/doctab.ts
index b31794a..a61767a 100644
--- a/i18n/cz/doctab.ts
+++ b/i18n/cz/doctab.ts
@@ -1,32 +1,31 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>DocTabSettingsBase</name>
     <message>
-      <source>DocTab Settings</source>
-      <translation>Nastavení záložky Dokumenty</translation>
+        <source>DocTab Settings</source>
+        <translation>Nastavení záložky Dokumenty</translation>
     </message>
     <message>
-      <source>Enable the DocTab</source>
-      <translation>Zapnout záložku Dokumenty</translation>
+        <source>Enable the DocTab</source>
+        <translation>Zapnout záložku Dokumenty</translation>
     </message>
     <message>
-      <source>Yes, please!</source>
-      <translation>Ano, prosím!</translation>
+        <source>Yes, please!</source>
+        <translation>Ano, prosím!</translation>
     </message>
     <message>
-      <source>No, thanks.</source>
-      <translation>Ne, děkuji.</translation>
+        <source>No, thanks.</source>
+        <translation>Ne, děkuji.</translation>
     </message>
     <message>
-      <source>&lt;b>Do you want a Documents Tab?&lt;/b>&lt;p>
-(Note that such a tab scans &lt;i>all&lt;/i> documents
-on &lt;i>all&lt;/i> external media, which can be quite
+        <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>Opravdu chcete záložku Dokumenty?&lt;/b>&lt;p>
-(Tato záložka prohledá &lt;i>všechny&lt;/i> dokumenty
-na &lt;i>všech&lt;/i> externích médiích, což může být značně
+        <translation>&lt;b&gt;Opravdu chcete záložku Dokumenty?&lt;/b&gt;&lt;p&gt;
+(Tato záložka prohledá &lt;i&gt;všechny&lt;/i&gt; dokumenty
+na &lt;i&gt;všech&lt;/i&gt; externích médiích, což může být značně
 pomalé a nepříjemné...)</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/embeddedkonsole.ts b/i18n/cz/embeddedkonsole.ts
index 65a2cd9..4e3df5a 100644
--- a/i18n/cz/embeddedkonsole.ts
+++ b/i18n/cz/embeddedkonsole.ts
@@ -1,250 +1,249 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>CommandEditDialog</name>
     <message>
-      <source>Command Selection</source>
-      <translation>Výběr příkazu</translation>
+        <source>Command Selection</source>
+        <translation>Výběr příkazu</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CommandEditDialogBase</name>
     <message>
-      <source>Commands</source>
-      <translation>Příkazy</translation>
+        <source>Commands</source>
+        <translation>Příkazy</translation>
     </message>
     <message>
-      <source>&lt;B>Commands&lt;/B>:</source>
-      <translation>&lt;B>Příkazy&lt;/B>:</translation>
+        <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
+        <translation>&lt;B&gt;Příkazy&lt;/B&gt;:</translation>
     </message>
     <message>
-      <source>&lt;B>Suggested Commands&lt;/B>:</source>
-      <translation>&lt;B>Navržené příkazy&lt;/B>:</translation>
+        <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
+        <translation>&lt;B&gt;Navržené příkazy&lt;/B&gt;:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Konsole</name>
     <message>
-      <source>Terminal</source>
-      <translation>Terminál</translation>
+        <source>Terminal</source>
+        <translation>Terminál</translation>
     </message>
     <message>
-      <source>Command List</source>
-      <translation>Seznam příkazů</translation>
+        <source>Command List</source>
+        <translation>Seznam příkazů</translation>
     </message>
     <message>
-      <source>Show command list</source>
-      <translation>Ukázat seznam příkazů</translation>
+        <source>Show command list</source>
+        <translation>Ukázat seznam příkazů</translation>
     </message>
     <message>
-      <source>Hide command list</source>
-      <translation>Schovat seznam příkazů</translation>
+        <source>Hide command list</source>
+        <translation>Schovat seznam příkazů</translation>
     </message>
     <message>
-      <source>Green on Black</source>
-      <translation>Zelená na černé</translation>
+        <source>Green on Black</source>
+        <translation>Zelená na černé</translation>
     </message>
     <message>
-      <source>Black on White</source>
-      <translation>Černá na bílé</translation>
+        <source>Black on White</source>
+        <translation>Černá na bílé</translation>
     </message>
     <message>
-      <source>White on Black</source>
-      <translation>Bílá na černé</translation>
+        <source>White on Black</source>
+        <translation>Bílá na černé</translation>
     </message>
     <message>
-      <source>Green on Yellow</source>
-      <translation>Zelená na žluté</translation>
+        <source>Green on Yellow</source>
+        <translation>Zelená na žluté</translation>
     </message>
     <message>
-      <source>Blue on Magenta</source>
-      <translation>Modrá na purpurové</translation>
+        <source>Blue on Magenta</source>
+        <translation>Modrá na purpurové</translation>
     </message>
     <message>
-      <source>Magenta on Blue</source>
-      <translation>Purpurová na modré</translation>
+        <source>Magenta on Blue</source>
+        <translation>Purpurová na modré</translation>
     </message>
     <message>
-      <source>Cyan on White</source>
-      <translation>Azurová na bílé</translation>
+        <source>Cyan on White</source>
+        <translation>Azurová na bílé</translation>
     </message>
     <message>
-      <source>White on Cyan</source>
-      <translation>Bílá na azurové</translation>
+        <source>White on Cyan</source>
+        <translation>Bílá na azurové</translation>
     </message>
     <message>
-      <source>Blue on Black</source>
-      <translation>Modrá na černé</translation>
+        <source>Blue on Black</source>
+        <translation>Modrá na černé</translation>
     </message>
     <message>
-      <source>Amber on Black</source>
-      <translation>Jantarová na černé</translation>
+        <source>Amber on Black</source>
+        <translation>Jantarová na černé</translation>
     </message>
     <message>
-      <source>Custom</source>
-      <translation>Vlastní</translation>
+        <source>Custom</source>
+        <translation>Vlastní</translation>
     </message>
     <message>
-      <source>Colors</source>
-      <translation>Barvy</translation>
+        <source>Colors</source>
+        <translation>Barvy</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nový</translation>
+        <source>New</source>
+        <translation>Nový</translation>
     </message>
     <message>
-      <source>Enter</source>
-      <translation>Enter</translation>
+        <source>Enter</source>
+        <translation>Enter</translation>
     </message>
     <message>
-      <source>Space</source>
-      <translation>Mezera</translation>
+        <source>Space</source>
+        <translation>Mezera</translation>
     </message>
     <message>
-      <source>Tab</source>
-      <translation>Tab</translation>
+        <source>Tab</source>
+        <translation>Tab</translation>
     </message>
     <message>
-      <source>Up</source>
-      <translation>Nahoru</translation>
+        <source>Up</source>
+        <translation>Nahoru</translation>
     </message>
     <message>
-      <source>Down</source>
-      <translation>Dolů</translation>
+        <source>Down</source>
+        <translation>Dolů</translation>
     </message>
     <message>
-      <source>Paste</source>
-      <translation>Vložit</translation>
+        <source>Paste</source>
+        <translation>Vložit</translation>
     </message>
     <message>
-      <source>Quick Edit</source>
-      <translation>Rychlá úprava</translation>
+        <source>Quick Edit</source>
+        <translation>Rychlá úprava</translation>
     </message>
     <message>
-      <source>None</source>
-      <translation>Žádný</translation>
+        <source>None</source>
+        <translation>Žádný</translation>
     </message>
     <message>
-      <source>Left</source>
-      <translation>vlevo</translation>
+        <source>Left</source>
+        <translation>vlevo</translation>
     </message>
     <message>
-      <source>Right</source>
-      <translation>vpravo</translation>
+        <source>Right</source>
+        <translation>vpravo</translation>
     </message>
     <message>
-      <source>ScrollBar</source>
-      <translation>Posuvník</translation>
+        <source>ScrollBar</source>
+        <translation>Posuvník</translation>
     </message>
     <message>
-      <source>Wrap</source>
-      <translation>Zalamovat</translation>
+        <source>Wrap</source>
+        <translation>Zalamovat</translation>
     </message>
     <message>
-      <source>Use Beep</source>
-      <translation>Použít zvuky</translation>
+        <source>Use Beep</source>
+        <translation>Použít zvuky</translation>
     </message>
     <message>
-      <source>Show Command List</source>
-      <translation>Ukázat seznam příkazů</translation>
+        <source>Show Command List</source>
+        <translation>Ukázat seznam příkazů</translation>
     </message>
     <message>
-      <source>Hide Command List</source>
-      <translation>Schovat seznam příkazů</translation>
+        <source>Hide Command List</source>
+        <translation>Schovat seznam příkazů</translation>
     </message>
     <message>
-      <source>Konsole</source>
-      <translation>Konsole</translation>
+        <source>Konsole</source>
+        <translation>Konsole</translation>
     </message>
     <message>
-      <source>Bottom</source>
-      <translation>Dole</translation>
+        <source>Bottom</source>
+        <translation>Dole</translation>
     </message>
     <message>
-      <source>Top</source>
-      <translation>Nahoře</translation>
+        <source>Top</source>
+        <translation>Nahoře</translation>
     </message>
     <message>
-      <source>Hidden</source>
-      <translation>Skryté</translation>
+        <source>Hidden</source>
+        <translation>Skryté</translation>
     </message>
     <message>
-      <source>Tabs</source>
-      <translation>Záložky</translation>
+        <source>Tabs</source>
+        <translation>Záložky</translation>
     </message>
     <message>
-      <source>Black on Pink</source>
-      <translation>Černá na růžové</translation>
+        <source>Black on Pink</source>
+        <translation>Černá na růžové</translation>
     </message>
     <message>
-      <source>Pink on Black</source>
-      <translation>Růžová na černé</translation>
+        <source>Pink on Black</source>
+        <translation>Růžová na černé</translation>
     </message>
     <message>
-      <source>default</source>
-      <translation>výchozí</translation>
+        <source>default</source>
+        <translation>výchozí</translation>
     </message>
     <message>
-      <source>new session</source>
-      <translation>nová relace</translation>
+        <source>new session</source>
+        <translation>nová relace</translation>
     </message>
     <message>
-      <source>View</source>
-      <translation>Zobrazit</translation>
+        <source>View</source>
+        <translation>Zobrazit</translation>
     </message>
     <message>
-      <source>Fonts</source>
-      <translation>Písma</translation>
+        <source>Fonts</source>
+        <translation>Písma</translation>
     </message>
     <message>
-      <source>Sessions</source>
-      <translation>Relace</translation>
+        <source>Sessions</source>
+        <translation>Relace</translation>
     </message>
     <message>
-      <source>Full Screen</source>
-      <translation>Celá obrazovka</translation>
+        <source>Full Screen</source>
+        <translation>Celá obrazovka</translation>
     </message>
     <message>
-      <source>Zoom</source>
-      <translation>Lupa</translation>
+        <source>Zoom</source>
+        <translation>Lupa</translation>
     </message>
     <message>
-      <source>Edit...</source>
-      <translation>Upravit...</translation>
+        <source>Edit...</source>
+        <translation>Upravit...</translation>
     </message>
     <message>
-      <source>History...</source>
-      <translation>Historie...</translation>
+        <source>History...</source>
+        <translation>Historie...</translation>
     </message>
     <message>
-      <source>To exit fullscreen, tap here.</source>
-      <translation>Klikněte sem pro opuštění celé obrazovky.</translation>
+        <source>To exit fullscreen, tap here.</source>
+        <translation>Klikněte sem pro opuštění celé obrazovky.</translation>
     </message>
     <message>
-      <source>History Lines:</source>
-      <translation>Řádek historie:</translation>
+        <source>History Lines:</source>
+        <translation>Řádek historie:</translation>
     </message>
     <message>
-      <source>Konsole </source>
-      <translation>Konsole </translation>
+        <source>Konsole </source>
+        <translation>Konsole </translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PlayListSelection</name>
     <message>
-      <source>Command Selection</source>
-      <translation>Výběr příkazu</translation>
+        <source>Command Selection</source>
+        <translation>Výběr příkazu</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>editCommandBase</name>
     <message>
-      <source>Add command</source>
-      <translation>Přidat příkaz</translation>
+        <source>Add command</source>
+        <translation>Přidat příkaz</translation>
     </message>
     <message>
-      <source>Enter command to add:</source>
-      <translation>Zadejte příkaz, který chcete přidat:</translation>
+        <source>Enter command to add:</source>
+        <translation>Zadejte příkaz, který chcete přidat:</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/fifteen.ts b/i18n/cz/fifteen.ts
index 5095737..8b7a8f4 100644
--- a/i18n/cz/fifteen.ts
+++ b/i18n/cz/fifteen.ts
@@ -1,97 +1,96 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>FifteenConfigDialog</name>
     <message>
-      <source>All Images</source>
-      <translation>Všechny obrázky</translation>
+        <source>All Images</source>
+        <translation>Všechny obrázky</translation>
     </message>
     <message>
-      <source>All Files</source>
-      <translation>Všechny soubory</translation>
+        <source>All Files</source>
+        <translation>Všechny soubory</translation>
     </message>
     <message>
-      <source>Select board background</source>
-      <translation>Vyberte pozadí plochy</translation>
+        <source>Select board background</source>
+        <translation>Vyberte pozadí plochy</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FifteenConfigDialogBase</name>
     <message>
-      <source>Configure Fifteen</source>
-      <translation>Kanfigurace Patnáctky</translation>
+        <source>Configure Fifteen</source>
+        <translation>Kanfigurace Patnáctky</translation>
     </message>
     <message>
-      <source>Use a Custom Image</source>
-      <translation>Použít vlastí obrázek</translation>
+        <source>Use a Custom Image</source>
+        <translation>Použít vlastí obrázek</translation>
     </message>
     <message>
-      <source>Custom Image</source>
-      <translation>Vlastní obrázek</translation>
+        <source>Custom Image</source>
+        <translation>Vlastní obrázek</translation>
     </message>
     <message>
-      <source>&lt;b>Path:&lt;/b></source>
-      <translation>&lt;b>Cesta:&lt;/b></translation>
+        <source>&lt;b&gt;Path:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Cesta:&lt;/b&gt;</translation>
     </message>
     <message>
-      <source>...</source>
-      <translation>...</translation>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-      <source>&lt;b>Preview:&lt;/b></source>
-      <translation>&lt;b>Náhled:&lt;/b></translation>
+        <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Náhled:&lt;/b&gt;</translation>
     </message>
     <message>
-      <source>Grid</source>
-      <translation>Mříž</translation>
+        <source>Grid</source>
+        <translation>Mříž</translation>
     </message>
     <message>
-      <source>&lt;b>Rows:&lt;/b></source>
-      <translation>&lt;b>Řádek:&lt;/b></translation>
+        <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Řádek:&lt;/b&gt;</translation>
     </message>
     <message>
-      <source>&lt;b>Columns:&lt;/b></source>
-      <translation>&lt;b>Sloupců:&lt;/b></translation>
+        <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Sloupců:&lt;/b&gt;</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FifteenMainWindow</name>
     <message>
-      <source>Randomize</source>
-      <translation>Rozházet</translation>
+        <source>Randomize</source>
+        <translation>Rozházet</translation>
     </message>
     <message>
-      <source>Game</source>
-      <translation>Hra</translation>
+        <source>Game</source>
+        <translation>Hra</translation>
     </message>
     <message>
-      <source>Fifteen Pieces</source>
-      <translation>Patnáctka</translation>
+        <source>Fifteen Pieces</source>
+        <translation>Patnáctka</translation>
     </message>
     <message>
-      <source>Configure</source>
-      <translation>Konfigurovat</translation>
+        <source>Configure</source>
+        <translation>Konfigurovat</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PiecesTable</name>
     <message>
-      <source>Fifteen Pieces</source>
-      <translation>Patnáctka</translation>
+        <source>Fifteen Pieces</source>
+        <translation>Patnáctka</translation>
     </message>
     <message>
-      <source>Congratulations!
+        <source>Congratulations!
 You win the game!</source>
-      <translation>Gratuluji!
+        <translation>Gratuluji!
 Vyhrál jsi hru!</translation>
     </message>
     <message>
-      <source>R&amp;andomize Pieces</source>
-      <translation>R&amp;ozházet kameny</translation>
+        <source>R&amp;andomize Pieces</source>
+        <translation>R&amp;ozházet kameny</translation>
     </message>
     <message>
-      <source>&amp;Reset Pieces</source>
-      <translation>&amp;Resetovat kameny</translation>
+        <source>&amp;Reset Pieces</source>
+        <translation>&amp;Resetovat kameny</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/gutenbrowser.ts b/i18n/cz/gutenbrowser.ts
index cfabd4a..01b0f5c 100644
--- a/i18n/cz/gutenbrowser.ts
+++ b/i18n/cz/gutenbrowser.ts
@@ -1,458 +1,455 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>Edit_Title</name>
     <message>
-      <source>Edit Title</source>
-      <translation>Upravit název</translation>
+        <source>Edit Title</source>
+        <translation>Upravit název</translation>
     </message>
     <message>
-      <source>Cancel</source>
-      <translation>Storno</translation>
+        <source>Cancel</source>
+        <translation>Storno</translation>
     </message>
     <message>
-      <source>Apply</source>
-      <translation>Použít</translation>
+        <source>Apply</source>
+        <translation>Použít</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FontDialog</name>
     <message>
-      <source>Font Dialog</source>
-      <translation>Okno písma</translation>
+        <source>Font Dialog</source>
+        <translation>Okno písma</translation>
     </message>
     <message>
-      <source>Size</source>
-      <translation>Velikost</translation>
+        <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>
+        <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>
+</context>
+<context>
     <name>Gutenbrowser</name>
     <message>
-      <source>Gutenbrowser Output</source>
-      <translation>Gutenbrowser výstup</translation>
+        <source>Gutenbrowser Output</source>
+        <translation>Gutenbrowser výstup</translation>
     </message>
     <message>
-      <source>Running wget</source>
-      <translation>Spouštím wget</translation>
+        <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>
+        <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
+        <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ší
+        <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>
+        <source>&amp;Library Index</source>
+        <translation>&amp;Index knihovny</translation>
     </message>
     <message>
-      <source>&amp;Ftp Site</source>
-      <translation>&amp;Ftp místo</translation>
+        <source>&amp;Ftp Site</source>
+        <translation>&amp;Ftp místo</translation>
     </message>
     <message>
-      <source>&amp;Cancel</source>
-      <translation>&amp;Storno</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
     </message>
     <message>
-      <source>Note</source>
-      <translation>Poznámka</translation>
+        <source>Note</source>
+        <translation>Poznámka</translation>
     </message>
     <message>
-      <source>Etext Search</source>
-      <translation>Hledání Etextu</translation>
+        <source>Etext Search</source>
+        <translation>Hledání Etextu</translation>
     </message>
     <message>
-      <source>Please install unzip</source>
-      <translation>Prosím nainstalujte unzip</translation>
+        <source>Please install unzip</source>
+        <translation>Prosím nainstalujte unzip</translation>
     </message>
     <message>
-      <source>Gutenberg Library</source>
-      <translation>Knihovna Gutenberg</translation>
+        <source>Gutenberg Library</source>
+        <translation>Knihovna Gutenberg</translation>
     </message>
     <message>
-      <source>Gutenbrowser</source>
-      <translation>Gutenbrowser</translation>
+        <source>Gutenbrowser</source>
+        <translation>Gutenbrowser</translation>
     </message>
     <message>
-      <source>Open</source>
-      <translation>Otevřít</translation>
+        <source>Open</source>
+        <translation>Otevřít</translation>
     </message>
     <message>
-      <source>Search google.com</source>
-      <translation>Hledat v google.com</translation>
+        <source>Search google.com</source>
+        <translation>Hledat v google.com</translation>
     </message>
     <message>
-      <source>Edit Title</source>
-      <translation>Upravit název</translation>
+        <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>
+        <source>Please install unzip in your PATH</source>
+        <translation>Prosím nainstalujte unzip do vaší cesty</translation>
     </message>
-  </context>
-  <context>
+</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>
+        <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>
+        <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>for the original idea and concept of gutenbook.
 </source>
-      <translation>za originální nápad a koncept gutenbook.</translation>
+        <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>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>
+        <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>
+        <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>ljp@llornkcor.com
 </source>
-      <translation>ljp@llornkcor.com</translation>
+        <translation>ljp@llornkcor.com</translation>
     </message>
     <message>
-      <source>
+        <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
-      <translation>
+        <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's Laws of Documentation:</source>
-      <translation>Arnoldovy zákony dokumentace:</translation>
+        <source>Arnold&apos;s Laws of Documentation:</source>
+        <translation>Arnoldovy zákony dokumentace:</translation>
     </message>
     <message>
-      <source>(1) If it should exist, it doesn't.</source>
-      <translation>(1) Pokud by měla existovat, tak neexistuje.</translation>
+        <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's out of date.</source>
-      <translation>(2) Jestliže existuje, tak je zastaralá.</translation>
+        <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>
+        <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>
+        <source>useless programs transcends the</source>
+        <translation>nepoužitelné programy předstihne</translation>
     </message>
     <message>
-      <source>first two laws.
+        <source>first two laws.
 </source>
-      <translation>první dva zákony.</translation>
+        <translation>první dva zákony.</translation>
     </message>
     <message>
-      <source>Everything is temporary, anyway....
+        <source>Everything is temporary, anyway....
  :o)</source>
-      <translation>Vše je dočasné v každém případě....
+        <translation>Vše je dočasné v každém případě....
  :o)</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>HelpWindow</name>
     <message>
-      <source>&amp;Open File</source>
-      <translation>&amp;Otevřít soubor</translation>
+        <source>&amp;Open File</source>
+        <translation>&amp;Otevřít soubor</translation>
     </message>
     <message>
-      <source>&amp;Close</source>
-      <translation>&amp;Zavřít</translation>
+        <source>&amp;Close</source>
+        <translation>&amp;Zavřít</translation>
     </message>
     <message>
-      <source>&amp;Backward</source>
-      <translation>&amp;Zpět</translation>
+        <source>&amp;Backward</source>
+        <translation>&amp;Zpět</translation>
     </message>
     <message>
-      <source>&amp;Forward</source>
-      <translation>&amp;Vpřed</translation>
+        <source>&amp;Forward</source>
+        <translation>&amp;Vpřed</translation>
     </message>
     <message>
-      <source>&amp;Home</source>
-      <translation>&amp;Domů</translation>
+        <source>&amp;Home</source>
+        <translation>&amp;Domů</translation>
     </message>
     <message>
-      <source>Add Bookmark</source>
-      <translation>Přidat záložku</translation>
+        <source>Add Bookmark</source>
+        <translation>Přidat záložku</translation>
     </message>
     <message>
-      <source>&amp;File</source>
-      <translation>&amp;Soubor</translation>
+        <source>&amp;File</source>
+        <translation>&amp;Soubor</translation>
     </message>
     <message>
-      <source>&amp;Go</source>
-      <translation>&amp;Jdi</translation>
+        <source>&amp;Go</source>
+        <translation>&amp;Jdi</translation>
     </message>
     <message>
-      <source>History</source>
-      <translation>Historie</translation>
+        <source>History</source>
+        <translation>Historie</translation>
     </message>
     <message>
-      <source>Bookmarks</source>
-      <translation>Záložky</translation>
+        <source>Bookmarks</source>
+        <translation>Záložky</translation>
     </message>
     <message>
-      <source>Backward</source>
-      <translation>Zpět</translation>
+        <source>Backward</source>
+        <translation>Zpět</translation>
     </message>
     <message>
-      <source>Forward</source>
-      <translation>Vpřed</translation>
+        <source>Forward</source>
+        <translation>Vpřed</translation>
     </message>
     <message>
-      <source>Home</source>
-      <translation>Domů</translation>
+        <source>Home</source>
+        <translation>Domů</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LibraryDialog</name>
     <message>
-      <source>Library Index - using master pg index.</source>
-      <translation>Index knihovny - požívá hlavní pg index.</translation>
+        <source>Library Index - using master pg index.</source>
+        <translation>Index knihovny - požívá hlavní pg index.</translation>
     </message>
     <message>
-      <source>&lt;p>Error opening local library index:&lt;/P> </source>
-      <translation>&lt;p>Chyba otevření lokálního indexu knihovny:&lt;/P> </translation>
+        <source>&lt;p&gt;Error opening local library index:&lt;/P&gt; </source>
+        <translation>&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>
+        <source>Library Search</source>
+        <translation>Hledání hnihovny</translation>
     </message>
     <message>
-      <source>Downloading Gutenberg Index....</source>
-      <translation>Stahuji Gutenberg Index....</translation>
+        <source>Downloading Gutenberg Index....</source>
+        <translation>Stahuji Gutenberg Index....</translation>
     </message>
     <message>
-      <source>Running wget</source>
-      <translation>Spouštím wget</translation>
+        <source>Running wget</source>
+        <translation>Spouštím wget</translation>
     </message>
     <message>
-      <source>Title</source>
-      <translation>Titul</translation>
+        <source>Title</source>
+        <translation>Titul</translation>
     </message>
     <message>
-      <source>Author</source>
-      <translation>Autor</translation>
+        <source>Author</source>
+        <translation>Autor</translation>
     </message>
     <message>
-      <source>Year</source>
-      <translation>Rok</translation>
+        <source>Year</source>
+        <translation>Rok</translation>
     </message>
     <message>
-      <source>File</source>
-      <translation>Soubor</translation>
+        <source>File</source>
+        <translation>Soubor</translation>
     </message>
     <message>
-      <source>A-F</source>
-      <translation>A-F</translation>
+        <source>A-F</source>
+        <translation>A-F</translation>
     </message>
     <message>
-      <source>G-M</source>
-      <translation>G-M</translation>
+        <source>G-M</source>
+        <translation>G-M</translation>
     </message>
     <message>
-      <source>N-R</source>
-      <translation>N-R</translation>
+        <source>N-R</source>
+        <translation>N-R</translation>
     </message>
     <message>
-      <source>S-Z</source>
-      <translation>S-Z</translation>
+        <source>S-Z</source>
+        <translation>S-Z</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Options</source>
-      <translation>Možnosti</translation>
+        <source>Options</source>
+        <translation>Možnosti</translation>
     </message>
     <message>
-      <source>Open Automatically</source>
-      <translation>Otevřít automaticky</translation>
+        <source>Open Automatically</source>
+        <translation>Otevřít automaticky</translation>
     </message>
     <message>
-      <source>Last name first 
+        <source>Last name first 
 (requires library restart)</source>
-      <translation>Poslední jméno první 
+        <translation>Poslední jméno první 
 (vyžaduje restart knihovny)</translation>
     </message>
     <message>
-      <source>Search</source>
-      <translation>Hledat</translation>
+        <source>Search</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Close</source>
-      <translation>Zavřít</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source>   </source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>NetworkDialog</name>
     <message>
-      <source>FTP Download</source>
-      <translation>Stažení FTP</translation>
+        <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>
+        <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>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>OpenEtext</name>
     <message>
-      <source>All</source>
-      <translation>Vše</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Remove Etext</source>
-      <translation>Odstranit Etext</translation>
+        <source>Remove Etext</source>
+        <translation>Odstranit Etext</translation>
     </message>
     <message>
-      <source>&amp;Yes</source>
-      <translation>&amp;Ano</translation>
+        <source>&amp;Yes</source>
+        <translation>&amp;Ano</translation>
     </message>
     <message>
-      <source>&amp;Cancel</source>
-      <translation>&amp;Storno</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SearchDialog</name>
     <message>
-      <source>Sea&amp;rch</source>
-      <translation>Hle&amp;dat</translation>
+        <source>Sea&amp;rch</source>
+        <translation>Hle&amp;dat</translation>
     </message>
     <message>
-      <source>&amp;Cancel</source>
-      <translation>&amp;Storno</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
     </message>
     <message>
-      <source>Case Sensitive</source>
-      <translation>Rozlišovat velikost</translation>
+        <source>Case Sensitive</source>
+        <translation>Rozlišovat velikost</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SearchResultsDlg</name>
     <message>
-      <source>Search Results</source>
-      <translation>Výsledky hledání</translation>
+        <source>Search Results</source>
+        <translation>Výsledky hledání</translation>
     </message>
     <message>
-      <source>&amp;Download</source>
-      <translation>&amp;Stáhnout</translation>
+        <source>&amp;Download</source>
+        <translation>&amp;Stáhnout</translation>
     </message>
     <message>
-      <source>&amp;Cancel</source>
-      <translation>&amp;Storno</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>optionsDialog</name>
     <message>
-      <source>Opera</source>
-      <translation>Opera</translation>
+        <source>Opera</source>
+        <translation>Opera</translation>
     </message>
     <message>
-      <source>Konqueror</source>
-      <translation>Konqueror</translation>
+        <source>Konqueror</source>
+        <translation>Konqueror</translation>
     </message>
     <message>
-      <source>wget</source>
-      <translation>wget</translation>
+        <source>wget</source>
+        <translation>wget</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Vše</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Downloading ftp sites....</source>
-      <translation>Stahuji ftp místa...</translation>
+        <source>Downloading ftp sites....</source>
+        <translation>Stahuji ftp místa...</translation>
     </message>
     <message>
-      <source>Running wget</source>
-      <translation>Spouštím wget</translation>
+        <source>Running wget</source>
+        <translation>Spouštím wget</translation>
     </message>
     <message>
-      <source>Note</source>
-      <translation>Poznámka</translation>
+        <source>Note</source>
+        <translation>Poznámka</translation>
     </message>
     <message>
-      <source>ftpSiteDlg</source>
-      <translation>ftpmístoDlg</translation>
+        <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>
+        <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>
+        <source>File not opened sucessfully.</source>
+        <translation>Soubor není úspěšně otevřen.</translation>
     </message>
     <message>
-      <source>Main</source>
-      <translation>Hlavní</translation>
+        <source>Main</source>
+        <translation>Hlavní</translation>
     </message>
     <message>
-      <source>FTP</source>
-      <translation>FTP</translation>
+        <source>FTP</source>
+        <translation>FTP</translation>
     </message>
     <message>
-      <source>http://sailor.gutenberg.org</source>
-      <translation>http://sailor.gutenberg.org</translation>
+        <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>
+        <source>http://www.prairienet.org/pg</source>
+        <translation>http://www.prairienet.org/pg</translation>
     </message>
     <message>
-      <source>HTTP</source>
-      <translation>HTTP</translation>
+        <source>HTTP</source>
+        <translation>HTTP</translation>
     </message>
     <message>
-      <source>Gutenbrowser Options</source>
-      <translation>Gutenbrowser možnosti</translation>
+        <source>Gutenbrowser Options</source>
+        <translation>Gutenbrowser možnosti</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/kbill.ts b/i18n/cz/kbill.ts
index ddca1ad..e100f16 100644
--- a/i18n/cz/kbill.ts
+++ b/i18n/cz/kbill.ts
@@ -1,66 +1,65 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>KBill</name>
     <message>
-      <source>kBill</source>
-      <translation>kBill</translation>
+        <source>kBill</source>
+        <translation>kBill</translation>
     </message>
     <message>
-      <source>New game</source>
-      <translation>Nová hra</translation>
+        <source>New game</source>
+        <translation>Nová hra</translation>
     </message>
     <message>
-      <source>Pause game</source>
-      <translation>Přerušit hru</translation>
+        <source>Pause game</source>
+        <translation>Přerušit hru</translation>
     </message>
     <message>
-      <source>Story of kBill</source>
-      <translation>Příběh hry kBill</translation>
+        <source>Story of kBill</source>
+        <translation>Příběh hry kBill</translation>
     </message>
     <message>
-      <source>Rules</source>
-      <translation>Pravidla</translation>
+        <source>Rules</source>
+        <translation>Pravidla</translation>
     </message>
     <message>
-      <source>&amp;File</source>
-      <translation>&amp;Soubor</translation>
+        <source>&amp;File</source>
+        <translation>&amp;Soubor</translation>
     </message>
     <message>
-      <source>&amp;Help</source>
-      <translation>&amp;Help</translation>
+        <source>&amp;Help</source>
+        <translation>&amp;Help</translation>
     </message>
     <message>
-      <source>Pause Game</source>
-      <translation>Přerušit hru</translation>
+        <source>Pause Game</source>
+        <translation>Přerušit hru</translation>
     </message>
     <message>
-      <source>The story of KBill</source>
-      <translation>Příběh hry KBill</translation>
+        <source>The story of KBill</source>
+        <translation>Příběh hry KBill</translation>
     </message>
     <message>
-      <source>The rules of KBill</source>
-      <translation>Pravidla hry KBill</translation>
+        <source>The rules of KBill</source>
+        <translation>Pravidla hry KBill</translation>
     </message>
     <message>
-      <source>&lt;b>The Rules&lt;/b>&lt;p>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>&lt;UL>&lt;LI>Whack the Bills (click)&lt;/LI>&lt;LI>Restart the computer (click)&lt;/LI>&lt;LI>Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI>&lt;LI>Drag the bucket to extinguish sparks&lt;/LI>&lt;LI>Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI>&lt;/UL>&lt;P>As for the rest, you can probably work it out for yourself.  We did, so it can't be too hard</source>
-      <translation>&lt;b>Pravidla&lt;/b>&lt;p>kBill je usilovně navrhován a programován pro jednoduché použití celé rodiny, stejně jako pro malou Sally. Roky beta testování a konzultací s nejlevnějšími návrháři uživatelského rozhraní se projevilo ve hře, která je jednoduchá k použití, jako Macintosh.&lt;p>&lt;UL>&lt;LI>Bijte Billy (klik)&lt;/LI>&lt;LI>Restartujte počítač (klik)&lt;/LI>&lt;LI>Vemte zpět ztracené operační systémy &amp; (vraťte) je do svých počítačů&lt;/LI>&lt;LI>Vemte kbelík pro uhašení jisker&lt;/LI>&lt;LI>Bodování je založeno na celkovém čase běhu s bonusy za zabití Billů.&lt;/LI>&lt;/UL>&lt;P>Stejně jako pro ostatní, můžeš pravděpodobně pracovat pro sebe. My jsme to dělali, takže to nemůže být tak těžké</translation>
+        <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;Pravidla&lt;/b&gt;&lt;p&gt;kBill je usilovně navrhován a programován pro jednoduché použití celé rodiny, stejně jako pro malou Sally. Roky beta testování a konzultací s nejlevnějšími návrháři uživatelského rozhraní se projevilo ve hře, která je jednoduchá k použití, jako Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Bijte Billy (klik)&lt;/LI&gt;&lt;LI&gt;Restartujte počítač (klik)&lt;/LI&gt;&lt;LI&gt;Vemte zpět ztracené operační systémy &amp; (vraťte) je do svých počítačů&lt;/LI&gt;&lt;LI&gt;Vemte kbelík pro uhašení jisker&lt;/LI&gt;&lt;LI&gt;Bodování je založeno na celkovém čase běhu s bonusy za zabití Billů.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Stejně jako pro ostatní, můžeš pravděpodobně pracovat pro sebe. My jsme to dělali, takže to nemůže být tak těžké</translation>
     </message>
     <message>
-      <source>&lt;b>The Story&lt;/b>&lt;p>Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle 'Bill', 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!) 'Bill' 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>Příběh&lt;/b>&lt;p>A znovu, osud světa je ve vašich rukou!  Ďábelský počítačový hacker, známý pouze svým jménem 'Bill',vytvořil největší počítačový virus. Virus tak silný, že dikáže zmutovat normální operační systém 
-na toaster.  (ach!) 'Bill' naklonoval sám sebe na miliony mikroBillů.  Jejich jediný cíl je rozšířit tento zločinný virus, který byl chytře zamaskován jako populární operační systém. Jako systémový administrátor a vyhlazovač je vaše práce zabránit Billovi před dokončením jeho práce.</translation>
+        <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;Příběh&lt;/b&gt;&lt;p&gt;A znovu, osud světa je ve vašich rukou!  Ďábelský počítačový hacker, známý pouze svým jménem &apos;Bill&apos;,vytvořil největší počítačový virus. Virus tak silný, že dikáže zmutovat normální operační systém 
+na toaster.  (ach!) &apos;Bill&apos; naklonoval sám sebe na miliony mikroBillů.  Jejich jediný cíl je rozšířit tento zločinný virus, který byl chytře zamaskován jako populární operační systém. Jako systémový administrátor a vyhlazovač je vaše práce zabránit Billovi před dokončením jeho práce.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>UI</name>
     <message>
-      <source>After Level</source>
-      <translation>Po úrovni</translation>
+        <source>After Level</source>
+        <translation>Po úrovni</translation>
     </message>
     <message>
-      <source>Your score</source>
-      <translation>Vaše skóre</translation>
+        <source>Your score</source>
+        <translation>Vaše skóre</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/kcheckers.ts b/i18n/cz/kcheckers.ts
index d630c31..7e4361b 100644
--- a/i18n/cz/kcheckers.ts
+++ b/i18n/cz/kcheckers.ts
@@ -1,134 +1,133 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>KCheckers</name>
     <message>
-      <source>&amp;New</source>
-      <translation>&amp;Nový</translation>
+        <source>&amp;New</source>
+        <translation>&amp;Nový</translation>
     </message>
     <message>
-      <source>&amp;Undo Move</source>
-      <translation>&amp;Tah zpět</translation>
+        <source>&amp;Undo Move</source>
+        <translation>&amp;Tah zpět</translation>
     </message>
     <message>
-      <source>&amp;Quit</source>
-      <translation>&amp;Ukončit</translation>
+        <source>&amp;Quit</source>
+        <translation>&amp;Ukončit</translation>
     </message>
     <message>
-      <source>&amp;Beginner</source>
-      <translation>&amp;Začátečník</translation>
+        <source>&amp;Beginner</source>
+        <translation>&amp;Začátečník</translation>
     </message>
     <message>
-      <source>&amp;Novice</source>
-      <translation>&amp;Nováček</translation>
+        <source>&amp;Novice</source>
+        <translation>&amp;Nováček</translation>
     </message>
     <message>
-      <source>&amp;Average</source>
-      <translation>&amp;Průměrný</translation>
+        <source>&amp;Average</source>
+        <translation>&amp;Průměrný</translation>
     </message>
     <message>
-      <source>&amp;Good</source>
-      <translation>&amp;Dobrý</translation>
+        <source>&amp;Good</source>
+        <translation>&amp;Dobrý</translation>
     </message>
     <message>
-      <source>&amp;Expert</source>
-      <translation>&amp;Expert</translation>
+        <source>&amp;Expert</source>
+        <translation>&amp;Expert</translation>
     </message>
     <message>
-      <source>&amp;Master</source>
-      <translation>&amp;Master</translation>
+        <source>&amp;Master</source>
+        <translation>&amp;Master</translation>
     </message>
     <message>
-      <source>&amp;Show Numeration</source>
-      <translation>&amp;Zobrazení čísel</translation>
+        <source>&amp;Show Numeration</source>
+        <translation>&amp;Zobrazení čísel</translation>
     </message>
     <message>
-      <source>&amp;English Rules</source>
-      <translation>&amp;Anglická pravidla</translation>
+        <source>&amp;English Rules</source>
+        <translation>&amp;Anglická pravidla</translation>
     </message>
     <message>
-      <source>&amp;Russian Rules</source>
-      <translation>&amp;Ruská pravidla</translation>
+        <source>&amp;Russian Rules</source>
+        <translation>&amp;Ruská pravidla</translation>
     </message>
     <message>
-      <source>&amp;Green Board</source>
-      <translation>&amp;Zelená deska</translation>
+        <source>&amp;Green Board</source>
+        <translation>&amp;Zelená deska</translation>
     </message>
     <message>
-      <source>&amp;Marble Board</source>
-      <translation>&amp;Mramorová deska</translation>
+        <source>&amp;Marble Board</source>
+        <translation>&amp;Mramorová deska</translation>
     </message>
     <message>
-      <source>&amp;Wooden Board</source>
-      <translation>&amp;Dřevěná deska</translation>
+        <source>&amp;Wooden Board</source>
+        <translation>&amp;Dřevěná deska</translation>
     </message>
     <message>
-      <source>What's This</source>
-      <translation>Co je tohle</translation>
+        <source>What&apos;s This</source>
+        <translation>Co je tohle</translation>
     </message>
     <message>
-      <source>&amp;Rules of Play</source>
-      <translation>&amp;Pravidla hry</translation>
+        <source>&amp;Rules of Play</source>
+        <translation>&amp;Pravidla hry</translation>
     </message>
     <message>
-      <source>&amp;About KCheckers</source>
-      <translation>&amp;O aplikaci Dáma</translation>
+        <source>&amp;About KCheckers</source>
+        <translation>&amp;O aplikaci Dáma</translation>
     </message>
     <message>
-      <source>About &amp;Qt</source>
-      <translation>O &amp;Qt</translation>
+        <source>About &amp;Qt</source>
+        <translation>O &amp;Qt</translation>
     </message>
     <message>
-      <source>&amp;Game</source>
-      <translation>&amp;Hra</translation>
+        <source>&amp;Game</source>
+        <translation>&amp;Hra</translation>
     </message>
     <message>
-      <source>&amp;Skill</source>
-      <translation>&amp;Obtížnost</translation>
+        <source>&amp;Skill</source>
+        <translation>&amp;Obtížnost</translation>
     </message>
     <message>
-      <source>&amp;Options</source>
-      <translation>&amp;Možnosti</translation>
+        <source>&amp;Options</source>
+        <translation>&amp;Možnosti</translation>
     </message>
     <message>
-      <source>&amp;Help</source>
-      <translation>&amp;Nápověda</translation>
+        <source>&amp;Help</source>
+        <translation>&amp;Nápověda</translation>
     </message>
     <message>
-      <source> New Game </source>
-      <translation>Nová hra</translation>
+        <source> New Game </source>
+        <translation>Nová hra</translation>
     </message>
     <message>
-      <source> Undo Move </source>
-      <translation>Tah zpět</translation>
+        <source> Undo Move </source>
+        <translation>Tah zpět</translation>
     </message>
     <message>
-      <source> Rules of Play </source>
-      <translation>Pravidla hry</translation>
+        <source> Rules of Play </source>
+        <translation>Pravidla hry</translation>
     </message>
     <message>
-      <source>Go!</source>
-      <translation>Jeď!</translation>
+        <source>Go!</source>
+        <translation>Jeď!</translation>
     </message>
     <message>
-      <source>Congratulation! You have won!</source>
-      <translation>Gratuluji! Jseš vítěz!</translation>
+        <source>Congratulation! You have won!</source>
+        <translation>Gratuluji! Jseš vítěz!</translation>
     </message>
     <message>
-      <source>Please wait...</source>
-      <translation>Prosím čekejte...</translation>
+        <source>Please wait...</source>
+        <translation>Prosím čekejte...</translation>
     </message>
     <message>
-      <source>You have lost. Game over.</source>
-      <translation>Prohrál si. Konec hry.</translation>
+        <source>You have lost. Game over.</source>
+        <translation>Prohrál si. Konec hry.</translation>
     </message>
     <message>
-      <source>Incorrect course.</source>
-      <translation>Špatný směr.</translation>
+        <source>Incorrect course.</source>
+        <translation>Špatný směr.</translation>
     </message>
     <message>
-      <source>KCheckers</source>
-      <translation>Dáma</translation>
+        <source>KCheckers</source>
+        <translation>Dáma</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/keypebble.ts b/i18n/cz/keypebble.ts
index 58a7dbc..562a24d 100644
--- a/i18n/cz/keypebble.ts
+++ b/i18n/cz/keypebble.ts
@@ -1,293 +1,292 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>KRFBConnection</name>
     <message>
-      <source>Connected</source>
-      <translation>Připojeno</translation>
+        <source>Connected</source>
+        <translation>Připojeno</translation>
     </message>
     <message>
-      <source>Connection Refused</source>
-      <translation>Spojení odmítnuto</translation>
+        <source>Connection Refused</source>
+        <translation>Spojení odmítnuto</translation>
     </message>
     <message>
-      <source>Host not found</source>
-      <translation>Hostitel neexistuje</translation>
+        <source>Host not found</source>
+        <translation>Hostitel neexistuje</translation>
     </message>
     <message>
-      <source>Read Error: QSocket reported an error reading
+        <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
-      <translation>Chyba čtení: QSocket nahlásil chybu čtení dat,
+        <translation>Chyba čtení: QSocket nahlásil chybu čtení dat,
 vzdálený hostitel pravděpodobně ukončil
 spojení.</translation>
     </message>
     <message>
-      <source>QSocket reported an invalid error code</source>
-      <translation>QSocket nahlásil neplatný chybový kód</translation>
+        <source>QSocket reported an invalid error code</source>
+        <translation>QSocket nahlásil neplatný chybový kód</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>KRFBDecoder</name>
     <message>
-      <source>Waiting for desktop name...</source>
-      <translation>Čekání na název plochy...</translation>
+        <source>Waiting for desktop name...</source>
+        <translation>Čekání na název plochy...</translation>
     </message>
     <message>
-      <source>Connected to %1</source>
-      <translation>Připojeno k %1</translation>
+        <source>Connected to %1</source>
+        <translation>Připojeno k %1</translation>
     </message>
     <message>
-      <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-      <translation>Chyba protokolu: Místo očekávané update zprávy se objevila zpráva %1.</translation>
+        <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
+        <translation>Chyba protokolu: Místo očekávané update zprávy se objevila zpráva %1.</translation>
     </message>
     <message>
-      <source>Protocol Error: An unknown encoding was used by the server %1</source>
-      <translation>Chyba protokolu: Server %1 používá neznámé kódování</translation>
+        <source>Protocol Error: An unknown encoding was used by the server %1</source>
+        <translation>Chyba protokolu: Server %1 používá neznámé kódování</translation>
     </message>
     <message>
-      <source>Waiting for server initialization...</source>
-      <translation>Čekání na inicializaci serveru...</translation>
+        <source>Waiting for server initialization...</source>
+        <translation>Čekání na inicializaci serveru...</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>KRFBLogin</name>
     <message>
-      <source>Waiting for server version...</source>
-      <translation>Čekání na verzi serveru...</translation>
+        <source>Waiting for server version...</source>
+        <translation>Čekání na verzi serveru...</translation>
     </message>
     <message>
-      <source>Error: Invalid server version, %1</source>
-      <translation>Chyba: Neplatná verze serveru, %1</translation>
+        <source>Error: Invalid server version, %1</source>
+        <translation>Chyba: Neplatná verze serveru, %1</translation>
     </message>
     <message>
-      <source>Error: Unsupported server version, %1</source>
-      <translation>Chyba: Nepodporovaná verze serveru, %1</translation>
+        <source>Error: Unsupported server version, %1</source>
+        <translation>Chyba: Nepodporovaná verze serveru, %1</translation>
     </message>
     <message>
-      <source>Logged in</source>
-      <translation>Připojen</translation>
+        <source>Logged in</source>
+        <translation>Připojen</translation>
     </message>
     <message>
-      <source>Error: This server requires a password, but none has been specified.
+        <source>Error: This server requires a password, but none has been specified.
 </source>
-      <translation>Chyba: Server vyžaduje heslo, ale žádné nebylo zadáno.
+        <translation>Chyba: Server vyžaduje heslo, ale žádné nebylo zadáno.
 </translation>
     </message>
     <message>
-      <source>Error: The password you specified was incorrect.</source>
-      <translation>Chyba: Bylo zadáno špatné heslo.</translation>
+        <source>Error: The password you specified was incorrect.</source>
+        <translation>Chyba: Bylo zadáno špatné heslo.</translation>
     </message>
     <message>
-      <source>Error: Too many invalid login attempts have been made
+        <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
-      <translation>Chyba: Příliš mnoho špatných pokusů o připojení. Zkuste
+        <translation>Chyba: Příliš mnoho špatných pokusů o připojení. Zkuste
 to prosím později.</translation>
     </message>
     <message>
-      <source>Login Failed</source>
-      <translation>Připojení selhalo</translation>
+        <source>Login Failed</source>
+        <translation>Připojení selhalo</translation>
     </message>
     <message>
-      <source>Too many failures</source>
-      <translation>Příliš mnoho selhání</translation>
+        <source>Too many failures</source>
+        <translation>Příliš mnoho selhání</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>KVNC</name>
     <message>
-      <source>VNC Viewer</source>
-      <translation>VNC Viewer</translation>
+        <source>VNC Viewer</source>
+        <translation>VNC Viewer</translation>
     </message>
     <message>
-      <source>New Connection</source>
-      <translation>Nové připojení</translation>
+        <source>New Connection</source>
+        <translation>Nové připojení</translation>
     </message>
     <message>
-      <source>Open Bookmark</source>
-      <translation>Otevřít záložku</translation>
+        <source>Open Bookmark</source>
+        <translation>Otevřít záložku</translation>
     </message>
     <message>
-      <source>Delete Bookmark</source>
-      <translation>Smazat záložku</translation>
+        <source>Delete Bookmark</source>
+        <translation>Smazat záložku</translation>
     </message>
     <message>
-      <source>Full Screen</source>
-      <translation>Celá obrazovka</translation>
+        <source>Full Screen</source>
+        <translation>Celá obrazovka</translation>
     </message>
     <message>
-      <source>Send Contrl-Alt-Delete</source>
-      <translation>Poslat Contrl-Alt-Delete</translation>
+        <source>Send Contrl-Alt-Delete</source>
+        <translation>Poslat Contrl-Alt-Delete</translation>
     </message>
     <message>
-      <source>Disconnect</source>
-      <translation>Odpojit</translation>
+        <source>Disconnect</source>
+        <translation>Odpojit</translation>
     </message>
     <message>
-      <source>Next Click is Double Click</source>
-      <translation>Další klik je dvojitý klik</translation>
+        <source>Next Click is Double Click</source>
+        <translation>Další klik je dvojitý klik</translation>
     </message>
     <message>
-      <source>Next Click is Right Click</source>
-      <translation>Další klik je pravé tlačítko</translation>
+        <source>Next Click is Right Click</source>
+        <translation>Další klik je pravé tlačítko</translation>
     </message>
     <message>
-      <source>Stop Full Screen</source>
-      <translation>Vypnout režim celé obrazovky</translation>
+        <source>Stop Full Screen</source>
+        <translation>Vypnout režim celé obrazovky</translation>
     </message>
     <message>
-      <source>Connected to remote host</source>
-      <translation>Připojeno ke vzdálenému hostiteli</translation>
+        <source>Connected to remote host</source>
+        <translation>Připojeno ke vzdálenému hostiteli</translation>
     </message>
     <message>
-      <source>Logged in to remote host</source>
-      <translation>Přihlášeno ke vzdálenému hostiteli</translation>
+        <source>Logged in to remote host</source>
+        <translation>Přihlášeno ke vzdálenému hostiteli</translation>
     </message>
     <message>
-      <source>Connection closed</source>
-      <translation>Spojení ukončeno</translation>
+        <source>Connection closed</source>
+        <translation>Spojení ukončeno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
-      <source>Bookmarks</source>
-      <translation>Záložky</translation>
+        <source>Bookmarks</source>
+        <translation>Záložky</translation>
     </message>
     <message>
-      <source>Choose a bookmark that you would like to open</source>
-      <translation>Vyberte záložku, kterou chcete otevřít</translation>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation>Vyberte záložku, kterou chcete otevřít</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>KVNCConnDlgBase</name>
     <message>
-      <source>VNC Viewer Connection</source>
-      <translation>VNC Viewer Připojení</translation>
+        <source>VNC Viewer Connection</source>
+        <translation>VNC Viewer Připojení</translation>
     </message>
     <message>
-      <source>Server</source>
-      <translation>Server</translation>
+        <source>Server</source>
+        <translation>Server</translation>
     </message>
     <message>
-      <source>The password of the VNC server</source>
-      <translation>Heslo VNC serveru</translation>
+        <source>The password of the VNC server</source>
+        <translation>Heslo VNC serveru</translation>
     </message>
     <message>
-      <source>Show Password</source>
-      <translation>Ukázat heslo</translation>
+        <source>Show Password</source>
+        <translation>Ukázat heslo</translation>
     </message>
     <message>
-      <source>Toggle obscuring the password</source>
-      <translation>Schovávání hesla</translation>
+        <source>Toggle obscuring the password</source>
+        <translation>Schovávání hesla</translation>
     </message>
     <message>
-      <source>Password:</source>
-      <translation>Heslo:</translation>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
     </message>
     <message>
-      <source>The name of the VNC server</source>
-      <translation>Název VNC serveru</translation>
+        <source>The name of the VNC server</source>
+        <translation>Název VNC serveru</translation>
     </message>
     <message>
-      <source>Bookmark Name:</source>
-      <translation>Název záložky:</translation>
+        <source>Bookmark Name:</source>
+        <translation>Název záložky:</translation>
     </message>
     <message>
-      <source>The host name of the VNC server</source>
-      <translation>Název hostitele VNC serveru</translation>
+        <source>The host name of the VNC server</source>
+        <translation>Název hostitele VNC serveru</translation>
     </message>
     <message>
-      <source>Host Name:</source>
-      <translation>Hostitel:</translation>
+        <source>Host Name:</source>
+        <translation>Hostitel:</translation>
     </message>
     <message>
-      <source>Display Number:</source>
-      <translation>Zobrazované číslo:</translation>
+        <source>Display Number:</source>
+        <translation>Zobrazované číslo:</translation>
     </message>
     <message>
-      <source>The display number of the VNC server</source>
-      <translation>Zobrazované číslo VNC serveru</translation>
+        <source>The display number of the VNC server</source>
+        <translation>Zobrazované číslo VNC serveru</translation>
     </message>
     <message>
-      <source>Options</source>
-      <translation>Možnosti</translation>
+        <source>Options</source>
+        <translation>Možnosti</translation>
     </message>
     <message>
-      <source>Request shared session</source>
-      <translation>Žádat sdílenou relaci</translation>
+        <source>Request shared session</source>
+        <translation>Žádat sdílenou relaci</translation>
     </message>
     <message>
-      <source>Allow other users to connect to the VNC server</source>
-      <translation>Umožnit ostatním připojit se k VNC serveru</translation>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation>Umožnit ostatním připojit se k VNC serveru</translation>
     </message>
     <message>
-      <source>Request 8-bit session</source>
-      <translation>Žádat 8-bit relaci</translation>
+        <source>Request 8-bit session</source>
+        <translation>Žádat 8-bit relaci</translation>
     </message>
     <message>
-      <source>Request that the VNC server transfer 8 bit color</source>
-      <translation>Žádat, aby VNC server posílal 8 bitové barvy</translation>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation>Žádat, aby VNC server posílal 8 bitové barvy</translation>
     </message>
     <message>
-      <source>Delay between requesting updates from the server</source>
-      <translation>Zpoždění mezi žádostmi o obnovení od serveru</translation>
+        <source>Delay between requesting updates from the server</source>
+        <translation>Zpoždění mezi žádostmi o obnovení od serveru</translation>
     </message>
     <message>
-      <source>1</source>
-      <translation>1</translation>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
-      <source>2</source>
-      <translation>2</translation>
+        <source>2</source>
+        <translation>2</translation>
     </message>
     <message>
-      <source>4</source>
-      <translation>4</translation>
+        <source>4</source>
+        <translation>4</translation>
     </message>
     <message>
-      <source>Scale the remote display to fit on the PDA (Slow)</source>
-      <translation>Přeměnit měřítko, aby se vešel na PDA (pomalé)</translation>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation>Přeměnit měřítko, aby se vešel na PDA (pomalé)</translation>
     </message>
     <message>
-      <source>Scale Factor</source>
-      <translation>Faktor měřítka</translation>
+        <source>Scale Factor</source>
+        <translation>Faktor měřítka</translation>
     </message>
     <message>
-      <source>Milliseconds</source>
-      <translation>Milisekund</translation>
+        <source>Milliseconds</source>
+        <translation>Milisekund</translation>
     </message>
     <message>
-      <source>Raise on bell</source>
-      <translation>Reagovat na zvonek</translation>
+        <source>Raise on bell</source>
+        <translation>Reagovat na zvonek</translation>
     </message>
     <message>
-      <source>Check for screen updates every:</source>
-      <translation>Zkoušet obnovit displej každých:</translation>
+        <source>Check for screen updates every:</source>
+        <translation>Zkoušet obnovit displej každých:</translation>
     </message>
     <message>
-      <source>Encodings</source>
-      <translation>Kódování</translation>
+        <source>Encodings</source>
+        <translation>Kódování</translation>
     </message>
     <message>
-      <source>Hextile encoding</source>
-      <translation>Kódování Hextile</translation>
+        <source>Hextile encoding</source>
+        <translation>Kódování Hextile</translation>
     </message>
     <message>
-      <source>CoRRE encoding</source>
-      <translation>Kódování coRRE</translation>
+        <source>CoRRE encoding</source>
+        <translation>Kódování coRRE</translation>
     </message>
     <message>
-      <source>RRE encoding</source>
-      <translation>Kódování RRE</translation>
+        <source>RRE encoding</source>
+        <translation>Kódování RRE</translation>
     </message>
     <message>
-      <source>Copy rectangle encoding</source>
-      <translation>Kódování Copy rectangle</translation>
+        <source>Copy rectangle encoding</source>
+        <translation>Kódování Copy rectangle</translation>
     </message>
     <message>
-      <source>Enable transmiting identical rectangles as references to existing data</source>
-      <translation>Zapnout posílání stejných obdélníků jako reference na existující data</translation>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation>Zapnout posílání stejných obdélníků jako reference na existující data</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/kpacman.ts b/i18n/cz/kpacman.ts
index 693dafe..4430851 100644
--- a/i18n/cz/kpacman.ts
+++ b/i18n/cz/kpacman.ts
@@ -1,72 +1,71 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>Keys</name>
     <message>
-      <source>Ok</source>
-      <translation>Ok</translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-      <source>Defaults</source>
-      <translation>Výchozí</translation>
+        <source>Defaults</source>
+        <translation>Výchozí</translation>
     </message>
     <message>
-      <source>Cancel</source>
-      <translation>Storno</translation>
+        <source>Cancel</source>
+        <translation>Storno</translation>
     </message>
     <message>
-      <source>Change Direction Keys</source>
-      <translation>Změnit směrové klávesy</translation>
+        <source>Change Direction Keys</source>
+        <translation>Změnit směrové klávesy</translation>
     </message>
     <message>
-      <source>Undefined key</source>
-      <translation>Nedefinovaná klávesa</translation>
+        <source>Undefined key</source>
+        <translation>Nedefinovaná klávesa</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Kpacman</name>
     <message>
-      <source>KPacman</source>
-      <translation>KPacman</translation>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
     </message>
     <message>
-      <source>&amp;New</source>
-      <translation>&amp;Nový</translation>
+        <source>&amp;New</source>
+        <translation>&amp;Nový</translation>
     </message>
     <message>
-      <source>&amp;Pause</source>
-      <translation>&amp;Pauza</translation>
+        <source>&amp;Pause</source>
+        <translation>&amp;Pauza</translation>
     </message>
     <message>
-      <source>&amp;Hall of fame</source>
-      <translation>&amp;Dvorana slávy</translation>
+        <source>&amp;Hall of fame</source>
+        <translation>&amp;Dvorana slávy</translation>
     </message>
     <message>
-      <source>&amp;Quit</source>
-      <translation>&amp;Ukončit</translation>
+        <source>&amp;Quit</source>
+        <translation>&amp;Ukončit</translation>
     </message>
     <message>
-      <source>&amp;Hide Mousecursor</source>
-      <translation>&amp;Skrýt ukazatel myši</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Change &amp;keys...</source>
+        <translation>Změnit &amp;klávesy...</translation>
     </message>
     <message>
-      <source>@PACKAGE@ - @VERSION@
+        <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
@@ -80,7 +79,7 @@ The design was strongly influenced by the pacman
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
-      <translation>@PACKAGE@ - @VERSION@
+        <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
@@ -96,158 +95,156 @@ za 10 let našeho přátelství.
 </translation>
     </message>
     <message>
-      <source>&amp;Help</source>
-      <translation>&amp;Nápověda</translation>
+        <source>&amp;Help</source>
+        <translation>&amp;Nápověda</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>KpacmanWidget</name>
     <message>
-      <source>The bitfont could not be contructed.
+        <source>The bitfont could not be contructed.
 
-The file '@FONTNAME@' does not exist,
+The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
-      <translation>Bitfont nelze sestavit.
+        <translation>Bitfont nelze sestavit.
 
-Soubor '@FONTNAME@' neexistuje,
+Soubor &apos;@FONTNAME@&apos; neexistuje,
 nebo má neznámý formát.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Referee</name>
     <message>
-      <source>GAME  OVER</source>
-      <translation>KONEC HRY</translation>
+        <source>GAME  OVER</source>
+        <translation>KONEC HRY</translation>
     </message>
     <message>
-      <source>PLAYER ONE</source>
-      <translation>HRÁČ 1</translation>
+        <source>PLAYER ONE</source>
+        <translation>HRÁČ 1</translation>
     </message>
     <message>
-      <source>READY!</source>
-      <translation>PŘIPRAVEN!</translation>
+        <source>READY!</source>
+        <translation>PŘIPRAVEN!</translation>
     </message>
     <message>
-      <source>PAUSED</source>
-      <translation>PAUZA</translation>
+        <source>PAUSED</source>
+        <translation>PAUZA</translation>
     </message>
     <message>
-      <source>CHARACTER</source>
-      <translation>POSTAVA</translation>
+        <source>CHARACTER</source>
+        <translation>POSTAVA</translation>
     </message>
     <message>
-      <source>/</source>
-      <translation>/</translation>
+        <source>/</source>
+        <translation>/</translation>
     </message>
     <message>
-      <source>NICKNAME</source>
-      <translation>PŘEZDÍVKA</translation>
+        <source>NICKNAME</source>
+        <translation>PŘEZDÍVKA</translation>
     </message>
     <message>
-      <source>-SHADOW</source>
-      <translation>-SHADOW</translation>
+        <source>-SHADOW</source>
+        <translation>-SHADOW</translation>
     </message>
     <message>
-      <source>&quot;BLINKY&quot;</source>
-      <translation>&quot;BLINKY&quot;</translation>
+        <source>&quot;BLINKY&quot;</source>
+        <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
-      <source>-SPEEDY</source>
-      <translation>-SPEEDY</translation>
+        <source>-SPEEDY</source>
+        <translation>-SPEEDY</translation>
     </message>
     <message>
-      <source>&quot;PINKY&quot;</source>
-      <translation>&quot;PINKY&quot;</translation>
+        <source>&quot;PINKY&quot;</source>
+        <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
-      <source>-BASHFUL</source>
-      <translation>-BASHFUL</translation>
+        <source>-BASHFUL</source>
+        <translation>-BASHFUL</translation>
     </message>
     <message>
-      <source>&quot;INKY&quot;</source>
-      <translation>&quot;INKY&quot;</translation>
+        <source>&quot;INKY&quot;</source>
+        <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
-      <source>-POKEY</source>
-      <translation>-POKEY</translation>
+        <source>-POKEY</source>
+        <translation>-POKEY</translation>
     </message>
     <message>
-      <source>&quot;CLYDE&quot;</source>
-      <translation>&quot;CLYDE&quot;</translation>
+        <source>&quot;CLYDE&quot;</source>
+        <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
-      <source>QTOPIA PORT: CATALIN CLIMOV</source>
-      <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
+        <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>
+        <source>PRESS CURSOR TO START</source>
+        <translation>PRO START STISKNĚTE KURZOR</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Score</name>
     <message>
-      <source>  1UP </source>
-      <translation>1HR</translation>
+        <source>  1UP </source>
+        <translation>1HR</translation>
     </message>
     <message>
-      <source> HIGH SCORE </source>
-      <translation>SKÓRE</translation>
+        <source> HIGH SCORE </source>
+        <translation>SKÓRE</translation>
     </message>
     <message>
-      <source>  2UP </source>
-      <translation>2HR</translation>
+        <source>  2UP </source>
+        <translation>2HR</translation>
     </message>
     <message>
-      <source>     CONGRATULATIONS      </source>
-      <translation>GRATULUJI</translation>
+        <source>     CONGRATULATIONS      </source>
+        <translation>GRATULUJI</translation>
     </message>
     <message>
-      <source>    YOU HAVE ARCHIEVED    </source>
-      <translation>JSEŠ ZAPSÁN</translation>
+        <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>
+        <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>
+        <source>RNK   SCORE  NAME   DATE</source>
+        <translation>RNK   SKÓRE  JMÉNO  DATUM</translation>
     </message>
     <message>
-      <source>PAUSED</source>
-      <translation>PAUZA</translation>
+        <source>PAUSED</source>
+        <translation>PAUZA</translation>
     </message>
     <message>
-      <source>@YY@/@MM@/@DD@</source>
-      <translation>@YY@/@MM@/@DD@</translation>
+        <source>@YY@/@MM@/@DD@</source>
+        <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Status</name>
     <message>
-      <source>The pixmap could not be contructed.
+        <source>The pixmap could not be contructed.
 
-The file '@PIXMAPNAME@' does not exist,
+The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
-      <translation>Pixmapu nelze sestavit.
+        <translation>Pixmapu nelze sestavit.
 
-Soubor '@PIXMAPNAME@' neexistuje,
+Soubor &apos;@PIXMAPNAME@&apos; neexistuje,
 nebo má neznámý formát.</translation>
     </message>
     <message>
-      <source>Initialization Error</source>
-      <translation>Chyba inicializace</translation>
+        <source>Initialization Error</source>
+        <translation>Chyba inicializace</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/language.ts b/i18n/cz/language.ts
index 05d8250..583c2f9 100644
--- a/i18n/cz/language.ts
+++ b/i18n/cz/language.ts
@@ -1,35 +1,34 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>LanguageSettings</name>
     <message>
-      <source>English</source>
-      <translation>Angličtina</translation>
+        <source>English</source>
+        <translation>Angličtina</translation>
     </message>
     <message>
-      <source>default</source>
-      <translation>Výchozí</translation>
+        <source>default</source>
+        <translation>Výchozí</translation>
     </message>
     <message>
-      <source>Language</source>
-      <translation>Jazyk</translation>
+        <source>Language</source>
+        <translation>Jazyk</translation>
     </message>
     <message>
-      <source>&lt;qt>Attention, all windows will be closed by changing the language
-without saving the Data.&lt;br>&lt;br>Go on?&lt;/qt></source>
-      <translation>&lt;qt>Upozornění, změnou jazyka budou všechna okna uzavřena
-bez uložení dat.&lt;br>&lt;br>Pokračovat?&lt;/qt></translation>
+        <source>&lt;qt&gt;Attention, all windows will be closed by changing the language
+without saving the Data.&lt;br&gt;&lt;br&gt;Go on?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Upozornění, změnou jazyka budou všechna okna uzavřena
+bez uložení dat.&lt;br&gt;&lt;br&gt;Pokračovat?&lt;/qt&gt;</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
-      <source>Language Settings</source>
-      <translation>Nastavení jazyka</translation>
+        <source>Language Settings</source>
+        <translation>Nastavení jazyka</translation>
     </message>
     <message>
-      <source>Select language</source>
-      <translation>Vyberte jazyk</translation>
+        <source>Select language</source>
+        <translation>Vyberte jazyk</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/launchersettings.ts b/i18n/cz/launchersettings.ts
index da68a14..a34a23a 100644
--- a/i18n/cz/launchersettings.ts
+++ b/i18n/cz/launchersettings.ts
@@ -1,263 +1,270 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>DocTabSettings</name>
     <message>
-      <source>Enable the Documents Tab</source>
-      <translation>Zapnout záložku Dokumenty</translation>
+        <source>Enable the Documents Tab</source>
+        <translation>Zapnout záložku Dokumenty</translation>
     </message>
     <message>
-      <source>&lt;b>Note:&lt;/b> Changing these settings may need restarting Opie to become effective.</source>
-      <translation>&lt;b>Poznámka:&lt;/b>Aby se změna projevila, bude možná potřeba restart Opie.</translation>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation>&lt;b&gt;Poznámka:&lt;/b&gt;Aby se změna projevila, bude možná potřeba restart Opie.</translation>
     </message>
     <message>
-      <source>Check, if you want the Documents Tab to be visible.</source>
-      <translation>Jestliže chcete mít záložku Dokumenty viditelnou, zaškrtněte volbu.</translation>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation>Jestliže chcete mít záložku Dokumenty viditelnou, zaškrtněte volbu.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>InputMethodSettings</name>
     <message>
-      <source>Resize application on Popup</source>
-      <translation>Změnit velikost okna aplikace při aktivaci</translation>
+        <source>Resize application on Popup</source>
+        <translation>Změnit velikost okna aplikace při aktivaci</translation>
     </message>
     <message>
-      <source>Enable floating and resizing</source>
-      <translation>Zapnout změnu velikosti okna</translation>
+        <source>Enable floating and resizing</source>
+        <translation>Zapnout změnu velikosti okna</translation>
     </message>
     <message>
-      <source>&lt;b>Note:&lt;/b> Changing these settings may need restarting Opie to become effective.</source>
-      <translation>&lt;b>Poznámka:&lt;/b>Aby se změna projevila, bude možná potřeba restart Opie.</translation>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation>&lt;b&gt;Poznámka:&lt;/b&gt;Aby se změna projevila, bude možná potřeba restart Opie.</translation>
     </message>
     <message>
-      <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
-      <translation>Zaškrtněte, jestliže chcete, aby při aktivaci vstupní metody se aplikace automaticky zmenšila.</translation>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation>Zaškrtněte, jestliže chcete, aby při aktivaci vstupní metody se aplikace automaticky zmenšila.</translation>
     </message>
     <message>
-      <source>Check, if you want to move and/or resize input methods</source>
-      <translation>Zaškrtněte, jestliže chcete posunovat, nebo měnit rozměry vstupních metod</translation>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation>Zaškrtněte, jestliže chcete posunovat, nebo měnit rozměry vstupních metod</translation>
     </message>
     <message>
-      <source>Specify the percentage of the screen width for the input method</source>
-      <translation>Zadejte šířku plochy v procentech, kterou obsadí vstupní metoda</translation>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation>Zadejte šířku plochy v procentech, kterou obsadí vstupní metoda</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
-      <source>Launcher Settings</source>
-      <translation>Nastavení spouštění</translation>
+        <source>Launcher Settings</source>
+        <translation>Nastavení spouštění</translation>
     </message>
     <message>
-      <source>Taskbar</source>
-      <translation>Lišta</translation>
+        <source>Taskbar</source>
+        <translation>Lišta</translation>
     </message>
     <message>
-      <source>O-Menu</source>
-      <translation>O-Menu</translation>
+        <source>O-Menu</source>
+        <translation>O-Menu</translation>
     </message>
     <message>
-      <source>Tabs</source>
-      <translation>Záložky</translation>
+        <source>Tabs</source>
+        <translation>Záložky</translation>
     </message>
     <message>
-      <source>InputMethods</source>
-      <translation>Vstupní metody</translation>
+        <source>InputMethods</source>
+        <translation>Vstupní metody</translation>
     </message>
     <message>
-      <source>DocTab</source>
-      <translation>Záložka Dokumenty</translation>
+        <source>DocTab</source>
+        <translation>Záložka Dokumenty</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MenuSettings</name>
     <message>
-      <source>Load applets in O-Menu:</source>
-      <translation>Nahrát aplikace v O-Menu:</translation>
+        <source>Load applets in O-Menu:</source>
+        <translation>Nahrát aplikace v O-Menu:</translation>
     </message>
     <message>
-      <source>Show Launcher tabs in O-Menu</source>
-      <translation>Ukazovat spouštěcí záložky v O-Menu</translation>
+        <source>Show Launcher tabs in O-Menu</source>
+        <translation>Ukazovat spouštěcí záložky v O-Menu</translation>
     </message>
     <message>
-      <source>Check the applets that you want to have included in the O-Menu.</source>
-      <translation>Zaškrtněte aplikace, které mají být součástí O-Menu.</translation>
+        <source>Check the applets that you want to have included in the O-Menu.</source>
+        <translation>Zaškrtněte aplikace, které mají být součástí O-Menu.</translation>
     </message>
     <message>
-      <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
-      <translation>Přidá obsah spouštěcích záložek jako menu v O-Menu.</translation>
+        <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
+        <translation>Přidá obsah spouštěcích záložek jako menu v O-Menu.</translation>
     </message>
     <message>
-      <source>Show Applications in Subpopups</source>
-      <translation>Zobrazí aplikace ve vyskakovacích podmenu</translation>
+        <source>Show Applications in Subpopups</source>
+        <translation>Zobrazí aplikace ve vyskakovacích podmenu</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Sample 1</source>
-      <translation>Příklad 1</translation>
+        <source>Sample 1</source>
+        <translation>Příklad 1</translation>
     </message>
     <message>
-      <source>Sample 2</source>
-      <translation>Příklad 2</translation>
+        <source>Sample 2</source>
+        <translation>Příklad 2</translation>
     </message>
     <message>
-      <source>Sample 3</source>
-      <translation>Příklad 3</translation>
+        <source>Sample 3</source>
+        <translation>Příklad 3</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>TabDialog</name>
     <message>
-      <source>Edit Tab</source>
-      <translation>Upravit záložku</translation>
+        <source>Edit Tab</source>
+        <translation>Upravit záložku</translation>
     </message>
     <message>
-      <source>Background</source>
-      <translation>Pozadí</translation>
+        <source>Background</source>
+        <translation>Pozadí</translation>
     </message>
     <message>
-      <source>Font</source>
-      <translation>Písmo</translation>
+        <source>Font</source>
+        <translation>Písmo</translation>
     </message>
     <message>
-      <source>Icons</source>
-      <translation>Ikony</translation>
+        <source>Icons</source>
+        <translation>Ikony</translation>
     </message>
     <message>
-      <source>Previewing %1</source>
-      <translation>Náhled %1</translation>
+        <source>Previewing %1</source>
+        <translation>Náhled %1</translation>
     </message>
     <message>
-      <source>This is a rough preview of what the currently selected Tab will look like.</source>
-      <translation>Toto je hrubý náhled toho, jak bude vypadat momentálně vybraná záložka.</translation>
+        <source>This is a rough preview of what the currently selected Tab will look like.</source>
+        <translation>Toto je hrubý náhled toho, jak bude vypadat momentálně vybraná záložka.</translation>
     </message>
     <message>
-      <source>Use a custom font</source>
-      <translation>Použít jiné písmo</translation>
+        <source>Use a custom font</source>
+        <translation>Použít jiné písmo</translation>
     </message>
     <message>
-      <source>Type:</source>
-      <translation>Typ:</translation>
+        <source>Type:</source>
+        <translation>Typ:</translation>
     </message>
     <message>
-      <source>Ruled</source>
-      <translation>Linkovaný</translation>
+        <source>Ruled</source>
+        <translation>Linkovaný</translation>
     </message>
     <message>
-      <source>Solid color</source>
-      <translation>Barva</translation>
+        <source>Solid color</source>
+        <translation>Barva</translation>
     </message>
     <message>
-      <source>Image</source>
-      <translation>Obrázek</translation>
+        <source>Image</source>
+        <translation>Obrázek</translation>
     </message>
     <message>
-      <source>Select...</source>
-      <translation>Vybrat...</translation>
+        <source>Select...</source>
+        <translation>Vybrat...</translation>
     </message>
     <message>
-      <source>Default</source>
-      <translation>Výchozí</translation>
+        <source>Default</source>
+        <translation>Výchozí</translation>
     </message>
     <message>
-      <source>Size:</source>
-      <translation>Velikost:</translation>
+        <source>Size:</source>
+        <translation>Velikost:</translation>
     </message>
     <message>
-      <source>Small</source>
-      <translation>Malý</translation>
+        <source>Small</source>
+        <translation>Malý</translation>
     </message>
     <message>
-      <source>Large</source>
-      <translation>Velký</translation>
+        <source>Large</source>
+        <translation>Velký</translation>
     </message>
     <message>
-      <source>Color:</source>
-      <translation>Barva:</translation>
+        <source>Color:</source>
+        <translation>Barva:</translation>
     </message>
-  </context>
-  <context>
+    <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>Záložky spouštěče:</translation>
+        <source>Launcher Tabs:</source>
+        <translation>Záložky spouštěče:</translation>
     </message>
     <message>
-      <source>foobar</source>
-      <translation>foobar</translation>
+        <source>foobar</source>
+        <translation>foobar</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nový</translation>
+        <source>New</source>
+        <translation>Nový</translation>
     </message>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Enable big busy indicator</source>
-      <translation>Velký ukazatel zaneprázdněnosti</translation>
+        <source>Enable big busy indicator</source>
+        <translation>Velký ukazatel zaneprázdněnosti</translation>
     </message>
     <message>
-      <source>Enable animated busy indicator</source>
-      <translation>Animovaný ukazatel zaneprázdněnosti</translation>
+        <source>Enable animated busy indicator</source>
+        <translation>Animovaný ukazatel zaneprázdněnosti</translation>
     </message>
     <message>
-      <source>Select the Launcher Tab you want to edit or delete.</source>
-      <translation>Vyberte záložku spouštěče, kterou chcete upravit, nebo smazat.</translation>
+        <source>Select the Launcher Tab you want to edit or delete.</source>
+        <translation>Vyberte záložku spouštěče, kterou chcete upravit, nebo smazat.</translation>
     </message>
     <message>
-      <source>Adds a new Tab to the Launcher.</source>
-      <translation>Přidat novou záložku do spouštěče.</translation>
+        <source>Adds a new Tab to the Launcher.</source>
+        <translation>Přidat novou záložku do spouštěče.</translation>
     </message>
     <message>
-      <source>Opens a new dialog to customize the select Tab.</source>
-      <translation>Otevře nové okno pro úpravu vybrané záložky.</translation>
+        <source>Opens a new dialog to customize the select Tab.</source>
+        <translation>Otevře nové okno pro úpravu vybrané záložky.</translation>
     </message>
     <message>
-      <source>Deletes a Tab from the Launcher.</source>
-      <translation>Smaže záložku ze spouštěče.</translation>
+        <source>Deletes a Tab from the Launcher.</source>
+        <translation>Smaže záložku ze spouštěče.</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>Pokud chcete místo malého ukazatele zaneprázdněnosti v liště velký uprostřed obrazovky, zapněte tuto volbu.</translation>
+        <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
+        <translation>Pokud chcete místo malého ukazatele zaneprázdněnosti v liště velký uprostřed obrazovky, zapněte tuto volbu.</translation>
     </message>
     <message>
-      <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
-      <translation>Pokud chcete animovaný ukazatel zaneprázdněnosti v liště, zapněte tuto volbu.</translation>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation>Pokud chcete animovaný ukazatel zaneprázdněnosti v liště, zapněte tuto volbu.</translation>
     </message>
     <message>
-      <source>All Tabs</source>
-      <translation>Všechny záložky</translation>
+        <source>All Tabs</source>
+        <translation>Všechny záložky</translation>
     </message>
     <message>
-      <source>Documents</source>
-      <translation>Dokumenty</translation>
+        <source>Documents</source>
+        <translation>Dokumenty</translation>
     </message>
     <message>
-      <source>Error</source>
-      <translation>Chyba</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>Not implemented yet</source>
-      <translation>Ještě nebylo implementováno</translation>
+        <source>Not implemented yet</source>
+        <translation>Ještě nebylo implementováno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>TaskbarSettings</name>
     <message>
-      <source>Load applets in Taskbar:</source>
-      <translation>Nahrávat aplikace na liště:</translation>
+        <source>Load applets in Taskbar:</source>
+        <translation>Nahrávat aplikace na liště:</translation>
     </message>
     <message>
-      <source>Check the applets that you want displayed in the Taskbar.</source>
-      <translation>Vyberte aplikace, které chcete mít zobrazené na liště.</translation>
+        <source>Check the applets that you want displayed in the Taskbar.</source>
+        <translation>Vyberte aplikace, které chcete mít zobrazené na liště.</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libGPRS.ts b/i18n/cz/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/cz/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libaboutapplet.ts b/i18n/cz/libaboutapplet.ts
index b267482..341d91b 100644
--- a/i18n/cz/libaboutapplet.ts
+++ b/i18n/cz/libaboutapplet.ts
@@ -1,87 +1,141 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>AboutApplet</name>
     <message>
-      <source>About shortcut</source>
-      <translation>O aplikaci zkratka</translation>
+        <source>About shortcut</source>
+        <translation>O aplikaci zkratka</translation>
     </message>
     <message>
-      <source>About</source>
-      <translation>O aplikaci</translation>
+        <source>About</source>
+        <translation>O aplikaci</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>AboutDialog</name>
     <message>
-      <source>About</source>
-      <translation>O aplikaci</translation>
+        <source>About</source>
+        <translation type="obsolete">O aplikaci</translation>
     </message>
     <message>
-      <source>Authors</source>
-      <translation>Autoři</translation>
+        <source>Authors</source>
+        <translation type="obsolete">Autoři</translation>
     </message>
     <message>
-      <source>Report</source>
-      <translation>Report</translation>
+        <source>Report</source>
+        <translation type="obsolete">Report</translation>
     </message>
     <message>
-      <source>Join</source>
-      <translation>Přidej se</translation>
+        <source>Join</source>
+        <translation type="obsolete">Přidej se</translation>
     </message>
     <message>
-      <source>&lt;p>
-The &lt;b>Open Palmtop Integrated Environment&lt;/b> is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p>
-&lt;p>
+        <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>
-&lt;p>
-Visit &lt;i>http://opie.handhelds.org&lt;/i> for more information on the Opie Project.
-&lt;/p></source>
-      <translation>&lt;p>
-&lt;b>Open Palmtop Integrated Environment&lt;/b> 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>
-&lt;p>
+&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>
-&lt;p>
-Pro více informaci o projektu Opie navštivte&lt;i>http://opie.handhelds.org&lt;/i>.
-&lt;/p></translation>
-    </message>
-    <message>
-      <source>&lt;p>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>
-&lt;p>The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i>http://opie.handhelds.org/&lt;/i> to report bugs.&lt;/p>
-&lt;p>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></source>
-      <translation>&lt;p>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>
-&lt;p>Open Palmtop Integrated Environment má systém na sledování chyb. Pro nahlášení chyb navštivte &lt;i>http://opie.handhelds.org/&lt;/i>.&lt;/p>
-&lt;p>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></translation>
-    </message>
-    <message>
-      <source>&lt;p>You don'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>
-&lt;p>Visit &lt;i>http://opie.handhelds.org/&lt;/i> for information on some projects in which you can participate.&lt;/p>
-&lt;p>If you need more information or documentation, then a visit to &lt;i>http://opie.handhelds.org/&lt;/i> will provide you with what you need.&lt;/p></source>
-      <translation>&lt;p> 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>
-&lt;p>Pro informace na kterých projektech můžete spolupracovat, navštivte &lt;i>http://opie.handhelds.org/&lt;/i>.&lt;/p>
-&lt;p>Jestliže potřebujete více informací, nebo dokumentaci, tak navštivte &lt;i>http://opie.handhelds.org/&lt;/i>.&lt;/p></translation>
-    </message>
-    <message>
-      <source>&lt;center>&lt;b>The Open Palmtop Integrated Environment V1.1.6&lt;/b>&lt;/center></source>
-      <translation type="unfinished" />
-    </message>
-    <message>
-      <source>&lt;p>
-&lt;b>Rajko 'alwin' Albrecht&lt;/b> (alwin@handhelds.org)&lt;br/>
-&lt;b>Stefan 'eilers' Eilers&lt;/b> (eilers@handhelds.org)&lt;br/>
-&lt;b>Holger 'Zecke' Freyther&lt;/b> (zecke@handhelds.org)&lt;br/>
-&lt;b>Chris 'Kergoth' Larson&lt;/b> (kergoth@handhelds.org)&lt;br/>
-&lt;b>Michael 'Mickey' Lauer&lt;/b> (mickeyl@handhelds.org)&lt;br/>
-&lt;b>Lorn 'ljp' Potter&lt;/b> (ljp@handhelds.org)&lt;br/>
-&lt;b>Max 'Harlekin' Reiss&lt;/b> (harlekin@handhelds.org)&lt;br/>
-&lt;b>Andreas 'ar' Richter&lt;/b> (ar@handhelds.org)&lt;br/>
-&lt;b>Dan 'drw' Williams&lt;/b> (drw@handhelds.org)&lt;/tt>&lt;br/>
-&lt;/p></source>
-      <translation type="unfinished" />
-    </message>
-  </context>
+&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 type="unfinished">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="unfinished"></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">&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 type="unfinished">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="unfinished"></translation>
+    </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished">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 type="unfinished">&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 type="unfinished">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 type="unfinished">&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>
 </TS>
diff --git a/i18n/cz/libbatteryapplet.ts b/i18n/cz/libbatteryapplet.ts
index b30df57..4a8eb76 100644
--- a/i18n/cz/libbatteryapplet.ts
+++ b/i18n/cz/libbatteryapplet.ts
@@ -1,90 +1,106 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>BatteryStatus</name>
     <message>
-      <source>Failure</source>
-      <translation>Závada</translation>
+        <source>Failure</source>
+        <translation>Závada</translation>
     </message>
     <message>
-      <source>could not open file</source>
-      <translation>nelze otevřít soubor</translation>
+        <source>could not open file</source>
+        <translation>nelze otevřít soubor</translation>
     </message>
     <message>
-      <source>no data</source>
-      <translation>nejsou data</translation>
+        <source>no data</source>
+        <translation>nejsou data</translation>
     </message>
     <message>
-      <source>Charging both devices</source>
-      <translation>Nabíjení obou zařízení</translation>
+        <source>Charging both devices</source>
+        <translation>Nabíjení obou zařízení</translation>
     </message>
     <message>
-      <source>Charging</source>
-      <translation>Nabíjení</translation>
+        <source>Charging</source>
+        <translation>Nabíjení</translation>
     </message>
     <message>
-      <source>Percentage battery remaining</source>
-      <translation>Stav baterie</translation>
+        <source>Percentage battery remaining</source>
+        <translation type="obsolete">Stav baterie</translation>
     </message>
     <message>
-      <source>Battery status: </source>
-      <translation>Stav baterie:</translation>
+        <source>Battery status: </source>
+        <translation>Stav baterie:</translation>
     </message>
     <message>
-      <source>Good</source>
-      <translation>Dobrý</translation>
+        <source>Good</source>
+        <translation>Dobrý</translation>
     </message>
     <message>
-      <source>Low</source>
-      <translation>Špatný</translation>
+        <source>Low</source>
+        <translation>Špatný</translation>
     </message>
     <message>
-      <source>Very Low</source>
-      <translation>Velmi špatný</translation>
+        <source>Very Low</source>
+        <translation>Velmi špatný</translation>
     </message>
     <message>
-      <source>Critical</source>
-      <translation>Kritický</translation>
+        <source>Critical</source>
+        <translation>Kritický</translation>
     </message>
     <message>
-      <source>Unknown</source>
-      <translation>Neznámý</translation>
+        <source>Unknown</source>
+        <translation>Neznámý</translation>
     </message>
     <message>
-      <source>On backup power</source>
-      <translation>Na záložním napájení</translation>
+        <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>
+        <source>Power on-line</source>
+        <translation>Připojeno k síti</translation>
     </message>
     <message>
-      <source>External power disconnected</source>
-      <translation>Externí zdroj odpojen</translation>
+        <source>External power disconnected</source>
+        <translation>Externí zdroj odpojen</translation>
     </message>
     <message>
-      <source>Battery time remaining</source>
-      <translation>Do vybití zbývá</translation>
+        <source>Battery time remaining</source>
+        <translation type="obsolete">Do vybití zbývá</translation>
     </message>
     <message>
-      <source>Ipaq  </source>
-      <translation>Ipaq</translation>
+        <source>Ipaq  </source>
+        <translation type="obsolete">Ipaq</translation>
     </message>
     <message>
-      <source>Percentage battery remaining: </source>
-      <translation>Stav baterie v procentech:</translation>
+        <source>Percentage battery remaining: </source>
+        <translation type="obsolete">Stav baterie v procentech:</translation>
     </message>
     <message>
-      <source>Battery time remaining: </source>
-      <translation>Do vybití zbývá:</translation>
+        <source>Battery time remaining: </source>
+        <translation type="obsolete">Do vybití zbývá:</translation>
     </message>
     <message>
-      <source>Jacket  </source>
-      <translation>Košilka</translation>
+        <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>
+        <source>No jacket with battery inserted</source>
+        <translation>Nebyla vložena košilka s baterií</translation>
     </message>
-  </context>
+    <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/cz/libbluetooth.ts b/i18n/cz/libbluetooth.ts
index cfbe053..30ef915 100644
--- a/i18n/cz/libbluetooth.ts
+++ b/i18n/cz/libbluetooth.ts
@@ -1,78 +1,104 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>BluetoothBNEPEdit</name>
     <message>
-      <source>&lt;p>No bluetooth device addresses specified&lt;/p></source>
-      <translation>&lt;p>Nebyly specifikovány adresy bluetooth zařízení&lt;/p></translation>
+        <source>&lt;p&gt;No bluetooth device addresses specified&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Nebyly specifikovány adresy bluetooth zařízení&lt;/p&gt;</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>BluetoothBNEPGUI</name>
     <message>
-      <source>Bluetooth-bnep</source>
-      <translation>Bluetooth-bnep</translation>
+        <source>Bluetooth-bnep</source>
+        <translation>Bluetooth-bnep</translation>
     </message>
     <message>
-      <source>Any available PAN device</source>
-      <translation>Jakékoliv dostupné PAN zařízení</translation>
+        <source>Any available PAN device</source>
+        <translation>Jakékoliv dostupné PAN zařízení</translation>
     </message>
     <message>
-      <source>Select Card</source>
-      <translation>Vyberte kartu</translation>
+        <source>Select Card</source>
+        <translation>Vyberte kartu</translation>
     </message>
     <message>
-      <source>BDAddress</source>
-      <translation>BD adresa</translation>
+        <source>BDAddress</source>
+        <translation>BD adresa</translation>
     </message>
     <message>
-      <source>Rescan</source>
-      <translation>Prohledat</translation>
+        <source>Rescan</source>
+        <translation>Prohledat</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>BluetoothBNEPNetNode</name>
     <message>
-      <source>Bluetooth PAN/NAP</source>
-      <translation>Bluetooth PAN/NAP</translation>
+        <source>Bluetooth PAN/NAP</source>
+        <translation>Bluetooth PAN/NAP</translation>
     </message>
     <message>
-      <source>&lt;p>Sets up a bluetooth link using the bluetooth Network profile.&lt;/p>&lt;p>Use this to connect two computing devices.&lt;/p></source>
-      <translation>&lt;p>Vytvoří bluetooth spojení s použitím bluetooth síťového profilu.&lt;/p>&lt;p>Toto použijte pro spojení dvou počítačových zařízení.&lt;/p></translation>
+        <source>&lt;p&gt;Sets up a bluetooth link using the bluetooth Network profile.&lt;/p&gt;&lt;p&gt;Use this to connect two computing devices.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Vytvoří bluetooth spojení s použitím bluetooth síťového profilu.&lt;/p&gt;&lt;p&gt;Toto použijte pro spojení dvou počítačových zařízení.&lt;/p&gt;</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>BluetoothRFCOMMGUI</name>
     <message>
-      <source>Bluetooth-rfcomm</source>
-      <translation>Bluetooth-rfcomm</translation>
+        <source>Bluetooth-rfcomm</source>
+        <translation>Bluetooth-rfcomm</translation>
     </message>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Description</source>
-      <translation>Popis</translation>
+        <source>Description</source>
+        <translation type="obsolete">Popis</translation>
     </message>
     <message>
-      <source>Start automatically</source>
-      <translation>Spustit automaticky</translation>
+        <source>Start automatically</source>
+        <translation type="obsolete">Spustit automaticky</translation>
     </message>
     <message>
-      <source>Confirm before start</source>
-      <translation>Potvrdit před spuštěním</translation>
+        <source>Confirm before start</source>
+        <translation type="obsolete">Potvrdit před spuštěním</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Selected devices with gprs capability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BluetoothRFCOMMNetNode</name>
     <message>
-      <source>Bluetooth serial link</source>
-      <translation>Bluetooth serial link</translation>
+        <source>Bluetooth serial link</source>
+        <translation>Bluetooth serial link</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Sets up a bluetooth link using the bluetooth serial profile.&lt;/p&gt;&lt;p&gt;Use this to connect to a GSM.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Vytvoří bluetooth spojení s použitím profilu sériového portu.&lt;/p&gt;&lt;p&gt;Použijte pro GSM spojení.&lt;/p&gt;</translation>
     </message>
+</context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
     <message>
-      <source>&lt;p>Sets up a bluetooth link using the bluetooth serial profile.&lt;/p>&lt;p>Use this to connect to a GSM.&lt;/p></source>
-      <translation>&lt;p>Vytvoří bluetooth spojení s použitím profilu sériového portu.&lt;/p>&lt;p>Použijte pro GSM spojení.&lt;/p></translation>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libbrightnessapplet.ts b/i18n/cz/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/cz/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/cz/libcable.ts b/i18n/cz/libcable.ts
index 9da3c42..3334fda 100644
--- a/i18n/cz/libcable.ts
+++ b/i18n/cz/libcable.ts
@@ -1,168 +1,171 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>CableEdit</name>
     <message>
-      <source>Device filename needed</source>
-      <translation>Potřebuji jméno zařízení</translation>
+        <source>Device filename needed</source>
+        <translation>Potřebuji jméno zařízení</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CableGUI</name>
     <message>
-      <source>Cable</source>
-      <translation>Kabel</translation>
+        <source>Cable</source>
+        <translation>Kabel</translation>
     </message>
     <message>
-      <source>Lock file</source>
-      <translation>Soubor zámku</translation>
+        <source>Lock file</source>
+        <translation>Soubor zámku</translation>
     </message>
     <message>
-      <source>Device</source>
-      <translation>Zařízení</translation>
+        <source>Device</source>
+        <translation>Zařízení</translation>
     </message>
     <message>
-      <source>Serial settings</source>
-      <translation>Sériová nastavení</translation>
+        <source>Serial settings</source>
+        <translation>Sériová nastavení</translation>
     </message>
     <message>
-      <source>2400</source>
-      <translation>2400</translation>
+        <source>2400</source>
+        <translation>2400</translation>
     </message>
     <message>
-      <source>9600</source>
-      <translation>9600</translation>
+        <source>9600</source>
+        <translation>9600</translation>
     </message>
     <message>
-      <source>19200</source>
-      <translation>19200</translation>
+        <source>19200</source>
+        <translation>19200</translation>
     </message>
     <message>
-      <source>38400</source>
-      <translation>38400</translation>
+        <source>38400</source>
+        <translation>38400</translation>
     </message>
     <message>
-      <source>57600</source>
-      <translation>57600</translation>
+        <source>57600</source>
+        <translation>57600</translation>
     </message>
     <message>
-      <source>115200</source>
-      <translation>115200</translation>
+        <source>115200</source>
+        <translation>115200</translation>
     </message>
     <message>
-      <source>230400</source>
-      <translation>230400</translation>
+        <source>230400</source>
+        <translation>230400</translation>
     </message>
     <message>
-      <source>460800</source>
-      <translation>460800</translation>
+        <source>460800</source>
+        <translation>460800</translation>
     </message>
     <message>
-      <source>500000</source>
-      <translation>500000</translation>
+        <source>500000</source>
+        <translation>500000</translation>
     </message>
     <message>
-      <source>921600</source>
-      <translation>921600</translation>
+        <source>921600</source>
+        <translation>921600</translation>
     </message>
     <message>
-      <source>1000000</source>
-      <translation>1000000</translation>
+        <source>1000000</source>
+        <translation>1000000</translation>
     </message>
     <message>
-      <source>1152000</source>
-      <translation>1152000</translation>
+        <source>1152000</source>
+        <translation>1152000</translation>
     </message>
     <message>
-      <source>1500000</source>
-      <translation>1500000</translation>
+        <source>1500000</source>
+        <translation>1500000</translation>
     </message>
     <message>
-      <source>2000000</source>
-      <translation>2000000</translation>
+        <source>2000000</source>
+        <translation>2000000</translation>
     </message>
     <message>
-      <source>2500000</source>
-      <translation>2500000</translation>
+        <source>2500000</source>
+        <translation>2500000</translation>
     </message>
     <message>
-      <source>3000000</source>
-      <translation>3000000</translation>
+        <source>3000000</source>
+        <translation>3000000</translation>
     </message>
     <message>
-      <source>3500000</source>
-      <translation>3500000</translation>
+        <source>3500000</source>
+        <translation>3500000</translation>
     </message>
     <message>
-      <source>4000000</source>
-      <translation>4000000</translation>
+        <source>4000000</source>
+        <translation>4000000</translation>
     </message>
     <message>
-      <source>Parity</source>
-      <translation>Parita</translation>
+        <source>Parity</source>
+        <translation>Parita</translation>
     </message>
     <message>
-      <source>Data bits</source>
-      <translation>Datové bity</translation>
+        <source>Data bits</source>
+        <translation>Datové bity</translation>
     </message>
     <message>
-      <source>Speed</source>
-      <translation>Rychlost</translation>
+        <source>Speed</source>
+        <translation>Rychlost</translation>
     </message>
     <message>
-      <source>Stop bits</source>
-      <translation>Stop bitů</translation>
+        <source>Stop bits</source>
+        <translation>Stop bitů</translation>
     </message>
     <message>
-      <source>No</source>
-      <translation>Ne</translation>
+        <source>No</source>
+        <translation>Ne</translation>
     </message>
     <message>
-      <source>Even</source>
-      <translation>Sudá</translation>
+        <source>Even</source>
+        <translation>Sudá</translation>
     </message>
     <message>
-      <source>Odd</source>
-      <translation>Lichá</translation>
+        <source>Odd</source>
+        <translation>Lichá</translation>
     </message>
     <message>
-      <source>Mark</source>
-      <translation>Značka</translation>
+        <source>Mark</source>
+        <translation>Značka</translation>
     </message>
     <message>
-      <source>Space</source>
-      <translation>Mezera</translation>
+        <source>Space</source>
+        <translation>Mezera</translation>
     </message>
     <message>
-      <source>1</source>
-      <translation>1</translation>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
-      <source>2</source>
-      <translation>2</translation>
+        <source>2</source>
+        <translation>2</translation>
     </message>
     <message>
-      <source>Flow control :</source>
-      <translation>Řízení toku :</translation>
+        <source>Flow control :</source>
+        <translation>Řízení toku :</translation>
     </message>
     <message>
-      <source>Hardware</source>
-      <translation>Hardwarové</translation>
+        <source>Hardware</source>
+        <translation>Hardwarové</translation>
     </message>
     <message>
-      <source>Software</source>
-      <translation>Softwarové</translation>
+        <source>Software</source>
+        <translation>Softwarové</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CableNetNode</name>
     <message>
-      <source>Cable Connection</source>
-      <translation>Připojení kabelu</translation>
+        <source>Cable Connection</source>
+        <translation type="obsolete">Připojení kabelu</translation>
     </message>
     <message>
-      <source>&lt;p>Sets up a wired serial or parallel.&lt;/p></source>
-      <translation>&lt;p>Vytvoří sériové, nebo paralelní propojení.&lt;/p></translation>
+        <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>
-  </context>
+    <message>
+        <source>Cable connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/cz/libcardmonapplet.ts b/i18n/cz/libcardmonapplet.ts
index 2ae5d3c..565a13d 100644
--- a/i18n/cz/libcardmonapplet.ts
+++ b/i18n/cz/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation>Vysunuto:</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/libclockapplet.ts b/i18n/cz/libclockapplet.ts
index ec25e94..0ed2af3 100644
--- a/i18n/cz/libclockapplet.ts
+++ b/i18n/cz/libclockapplet.ts
@@ -1,18 +1,17 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>LauncherClock</name>
     <message>
-      <source>Set time...</source>
-      <translation>Nastavit čas...</translation>
+        <source>Set time...</source>
+        <translation>Nastavit čas...</translation>
     </message>
     <message>
-      <source>Clock..</source>
-      <translation>Hodiny..</translation>
+        <source>Clock..</source>
+        <translation>Hodiny..</translation>
     </message>
     <message>
-      <source>Alarm...</source>
-      <translation>Budík...</translation>
+        <source>Alarm...</source>
+        <translation>Budík...</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libexample_applet.ts b/i18n/cz/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/cz/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libexample_board.ts b/i18n/cz/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/cz/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libexample_vpn.ts b/i18n/cz/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/cz/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libinterfaces.ts b/i18n/cz/libinterfaces.ts
index 5e4ee88..3843b77 100644
--- a/i18n/cz/libinterfaces.ts
+++ b/i18n/cz/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Restartuji rozhraní</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/cz/libirda.ts b/i18n/cz/libirda.ts
index 98bc68f..b14ab28 100644
--- a/i18n/cz/libirda.ts
+++ b/i18n/cz/libirda.ts
@@ -1,37 +1,36 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>IRDAGUI</name>
     <message>
-      <source>IRDA</source>
-      <translation>IrDA</translation>
+        <source>IRDA</source>
+        <translation>IrDA</translation>
     </message>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Description</source>
-      <translation>Popis</translation>
+        <source>Description</source>
+        <translation>Popis</translation>
     </message>
     <message>
-      <source>Start automatically</source>
-      <translation>Spustit automaticky</translation>
+        <source>Start automatically</source>
+        <translation>Spustit automaticky</translation>
     </message>
     <message>
-      <source>Confirm before start</source>
-      <translation>Potvrdit před spuštěním</translation>
+        <source>Confirm before start</source>
+        <translation>Potvrdit před spuštěním</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>IRDANetNode</name>
     <message>
-      <source>Infrared link</source>
-      <translation>Infra spojení</translation>
+        <source>Infrared link</source>
+        <translation>Infra spojení</translation>
     </message>
     <message>
-      <source>&lt;p>Sets up a infra red serial link.&lt;/p></source>
-      <translation>&lt;p>Vytvoří infračervené sériové spojení.&lt;/p></translation>
+        <source>&lt;p&gt;Sets up a infra red serial link.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Vytvoří infračervené sériové spojení.&lt;/p&gt;</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libkppp.ts b/i18n/cz/libkppp.ts
index e522cc5..253b96e 100644
--- a/i18n/cz/libkppp.ts
+++ b/i18n/cz/libkppp.ts
@@ -381,6 +381,10 @@ the device &quot;%1&quot;?</source>
         <source>You must enter a unique device name</source>
         <translation>Musíte vložit jedinečný název zařízení</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Chyba</translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/cz/liblancard.ts b/i18n/cz/liblancard.ts
index 4bb0fa8..92fafa9 100644
--- a/i18n/cz/liblancard.ts
+++ b/i18n/cz/liblancard.ts
@@ -1,41 +1,47 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>LanCardGUI</name>
     <message>
-      <source>LAN card</source>
-      <translation>LAN karta</translation>
+        <source>LAN card</source>
+        <translation>LAN karta</translation>
     </message>
     <message>
-      <source>Any available LAN card</source>
-      <translation>Jakákoliv dostupná LAN karta</translation>
+        <source>Any available LAN card</source>
+        <translation>Jakákoliv dostupná LAN karta</translation>
     </message>
     <message>
-      <source>Select Card</source>
-      <translation>Vyberte kartu</translation>
+        <source>Select Card</source>
+        <translation>Vyberte kartu</translation>
     </message>
     <message>
-      <source>MACAddress</source>
-      <translation>MAC adresa</translation>
+        <source>MACAddress</source>
+        <translation>MAC adresa</translation>
     </message>
     <message>
-      <source>Remove Unknown</source>
-      <translation>Odstranit neznámou</translation>
+        <source>Remove Unknown</source>
+        <translation>Odstranit neznámou</translation>
     </message>
     <message>
-      <source>Rescan</source>
-      <translation>Prohledat</translation>
+        <source>Rescan</source>
+        <translation>Prohledat</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LanCardNetNode</name>
     <message>
-      <source>LAN card</source>
-      <translation>LAN karta</translation>
+        <source>LAN card</source>
+        <translation>LAN karta</translation>
     </message>
     <message>
-      <source>&lt;p>Sets up a wired regular LAN card.&lt;/p>&lt;p>Use this to set up 10/100/1000 MBit LAN cards.&lt;/p></source>
-      <translation>&lt;p>Nastaví síťovou LAN kartu.&lt;/p>&lt;p>Použijte pro nastavení 10/100/1000 MBit LAN karet.&lt;/p></translation>
+        <source>&lt;p&gt;Sets up a wired regular LAN card.&lt;/p&gt;&lt;p&gt;Use this to set up 10/100/1000 MBit LAN cards.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Nastaví síťovou LAN kartu.&lt;/p&gt;&lt;p&gt;Použijte pro nastavení 10/100/1000 MBit LAN karet.&lt;/p&gt;</translation>
     </message>
-  </context>
+</context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/cz/liblockapplet.ts b/i18n/cz/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/cz/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libmailwrapper.ts b/i18n/cz/libmailwrapper.ts
index 3d0917f..af4ca0c 100644
--- a/i18n/cz/libmailwrapper.ts
+++ b/i18n/cz/libmailwrapper.ts
@@ -1,287 +1,303 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>IMAPwrapper</name>
     <message>
-      <source>error connecting imap server: %1</source>
-      <translation>chyba připojení k imap serveru: %1</translation>
+        <source>error connecting imap server: %1</source>
+        <translation>chyba připojení k imap serveru: %1</translation>
     </message>
     <message>
-      <source>error logging in imap server: %1</source>
-      <translation>chyba přihlášení k imap serveru: %1</translation>
+        <source>error logging in imap server: %1</source>
+        <translation>chyba přihlášení k imap serveru: %1</translation>
     </message>
     <message>
-      <source>Mailbox has no mails</source>
-      <translation>Schránka neobsahuje zprávy</translation>
+        <source>Mailbox has no mails</source>
+        <translation>Schránka neobsahuje zprávy</translation>
     </message>
     <message>
-      <source>Mailbox has %1 mails</source>
-      <translation>Ve schránce je %1 zpráv</translation>
+        <source>Mailbox has %1 mails</source>
+        <translation>Ve schránce je %1 zpráv</translation>
     </message>
     <message>
-      <source>Error fetching headers: %1</source>
-      <translation>Chyba ztažení hlaviček: %1</translation>
+        <source>Error fetching headers: %1</source>
+        <translation>Chyba ztažení hlaviček: %1</translation>
     </message>
     <message>
-      <source>Mailbox has no mails!</source>
-      <translation>Schránka neobsahuje zprávy!</translation>
+        <source>Mailbox has no mails!</source>
+        <translation>Schránka neobsahuje zprávy!</translation>
     </message>
     <message>
-      <source>error deleting mail: %s</source>
-      <translation>chyba smazání zprávy: %s</translation>
+        <source>error deleting mail: %s</source>
+        <translation>chyba smazání zprávy: %s</translation>
     </message>
     <message>
-      <source>Cannot create folder %1 for holding subfolders</source>
-      <translation>Nelze vytvořit složku %1 pro uskladnění podsložek</translation>
+        <source>Cannot create folder %1 for holding subfolders</source>
+        <translation>Nelze vytvořit složku %1 pro uskladnění podsložek</translation>
     </message>
     <message>
-      <source>%1</source>
-      <translation>%1</translation>
+        <source>%1</source>
+        <translation>%1</translation>
     </message>
     <message>
-      <source>error copy mails: %1</source>
-      <translation>chyba kopírování zpráv: %1</translation>
+        <source>error copy mails: %1</source>
+        <translation>chyba kopírování zpráv: %1</translation>
     </message>
     <message>
-      <source>error copy mail: %1</source>
-      <translation>chyba kopírování zprávy: %1</translation>
+        <source>error copy mail: %1</source>
+        <translation>chyba kopírování zprávy: %1</translation>
     </message>
     <message>
-      <source>Server has no TLS support!</source>
-      <translation>Server nemá podporu TLS!</translation>
+        <source>Server has no TLS support!</source>
+        <translation>Server nemá podporu TLS!</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LoginDialogUI</name>
     <message>
-      <source>Login</source>
-      <translation>Přihlášení</translation>
+        <source>Login</source>
+        <translation>Přihlášení</translation>
     </message>
     <message>
-      <source>User</source>
-      <translation>Jméno</translation>
+        <source>User</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Password</source>
-      <translation>Heslo</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MBOXwrapper</name>
     <message>
-      <source>Mailbox has %1 mail(s)</source>
-      <translation>Schránka obsahuje %1 zpráv</translation>
+        <source>Mailbox has %1 mail(s)</source>
+        <translation>Schránka obsahuje %1 zpráv</translation>
     </message>
     <message>
-      <source>Mailbox exists.</source>
-      <translation>Schránka existuje.</translation>
+        <source>Mailbox exists.</source>
+        <translation>Schránka existuje.</translation>
     </message>
     <message>
-      <source>Error init folder</source>
-      <translation>Nelze inicializovat složku</translation>
+        <source>Error init folder</source>
+        <translation>Nelze inicializovat složku</translation>
     </message>
     <message>
-      <source>Error writing to message folder</source>
-      <translation>Nelze zapsat do složky zpráv</translation>
+        <source>Error writing to message folder</source>
+        <translation>Nelze zapsat do složky zpráv</translation>
     </message>
     <message>
-      <source>Error initializing mbox</source>
-      <translation>Nelze inicializovat schránku</translation>
+        <source>Error initializing mbox</source>
+        <translation>Nelze inicializovat schránku</translation>
     </message>
     <message>
-      <source>Error fetching mail %i</source>
-      <translation>Nelze stáhnout zprávu %i</translation>
+        <source>Error fetching mail %i</source>
+        <translation>Nelze stáhnout zprávu %i</translation>
     </message>
     <message>
-      <source>Error deleting mail %1</source>
-      <translation>Nelze smazat zprávu %1</translation>
+        <source>Error deleting mail %1</source>
+        <translation>Nelze smazat zprávu %1</translation>
     </message>
     <message>
-      <source>Mailbox doesn't exist.</source>
-      <translation>Schránka neexistuje.</translation>
+        <source>Mailbox doesn&apos;t exist.</source>
+        <translation>Schránka neexistuje.</translation>
     </message>
     <message>
-      <source>Error deleting Mailbox.</source>
-      <translation>Nelze smazat schránku.</translation>
+        <source>Error deleting Mailbox.</source>
+        <translation>Nelze smazat schránku.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MHwrapper</name>
     <message>
-      <source>Mailbox has %1 mail(s)</source>
-      <translation>Ve schránce je %1 zpráv</translation>
+        <source>Mailbox has %1 mail(s)</source>
+        <translation>Ve schránce je %1 zpráv</translation>
     </message>
     <message>
-      <source>Error fetching mail %i</source>
-      <translation>Nelze stáhnout zprávu %i</translation>
+        <source>Error fetching mail %i</source>
+        <translation>Nelze stáhnout zprávu %i</translation>
     </message>
     <message>
-      <source>Error deleting mail %1</source>
-      <translation>Nelze smazat zprávu %1</translation>
+        <source>Error deleting mail %1</source>
+        <translation>Nelze smazat zprávu %1</translation>
     </message>
     <message>
-      <source>Error retrieving status</source>
-      <translation>Nelze zjistit stav</translation>
+        <source>Error retrieving status</source>
+        <translation>Nelze zjistit stav</translation>
     </message>
     <message>
-      <source>Error</source>
-      <translation>Chyba</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>Ok</source>
-      <translation>Ok</translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>POP3wrapper</name>
     <message>
-      <source>Mailbox contains %1 mail(s)</source>
-      <translation>Schránka obsahuje %1 zpráv</translation>
+        <source>Mailbox contains %1 mail(s)</source>
+        <translation>Schránka obsahuje %1 zpráv</translation>
     </message>
     <message>
-      <source>Error initializing folder</source>
-      <translation>Nelze inicializovat složku</translation>
+        <source>Error initializing folder</source>
+        <translation>Nelze inicializovat složku</translation>
     </message>
     <message>
-      <source>error deleting mail</source>
-      <translation>Nelze smazat zprávu</translation>
+        <source>error deleting mail</source>
+        <translation>Nelze smazat zprávu</translation>
     </message>
     <message>
-      <source>Error getting folder info</source>
-      <translation>Nelze zjistit informace o složce</translation>
+        <source>Error getting folder info</source>
+        <translation>Nelze zjistit informace o složce</translation>
     </message>
     <message>
-      <source>Error deleting mail %1</source>
-      <translation>Nelze smazat zprávu %1</translation>
+        <source>Error deleting mail %1</source>
+        <translation>Nelze smazat zprávu %1</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
     <message>
-      <source>No error</source>
-      <translation>Žádná chyba</translation>
+        <source>No error</source>
+        <translation>Žádná chyba</translation>
     </message>
     <message>
-      <source>Unexpected error code</source>
-      <translation>Neočekávaný chybový kód</translation>
+        <source>Unexpected error code</source>
+        <translation>Neočekávaný chybový kód</translation>
     </message>
     <message>
-      <source>Service not available</source>
-      <translation>Služba není k dispozici</translation>
+        <source>Service not available</source>
+        <translation>Služba není k dispozici</translation>
     </message>
     <message>
-      <source>Stream error</source>
-      <translation>Chyba toku</translation>
+        <source>Stream error</source>
+        <translation>Chyba toku</translation>
     </message>
     <message>
-      <source>gethostname() failed</source>
-      <translation>gethostname() selhalo</translation>
+        <source>gethostname() failed</source>
+        <translation>gethostname() selhalo</translation>
     </message>
     <message>
-      <source>Not implemented</source>
-      <translation>Není implementováno</translation>
+        <source>Not implemented</source>
+        <translation>Není implementováno</translation>
     </message>
     <message>
-      <source>Error, action not taken</source>
-      <translation>Chyba, akce se neprovedla</translation>
+        <source>Error, action not taken</source>
+        <translation>Chyba, akce se neprovedla</translation>
     </message>
     <message>
-      <source>Data exceeds storage allocation</source>
-      <translation>Data přesáhla velikost místa</translation>
+        <source>Data exceeds storage allocation</source>
+        <translation>Data přesáhla velikost místa</translation>
     </message>
     <message>
-      <source>Error in processing</source>
-      <translation>Chyba při zpracovávání</translation>
+        <source>Error in processing</source>
+        <translation>Chyba při zpracovávání</translation>
     </message>
     <message>
-      <source>Mailbox unavailable</source>
-      <translation>Schránka není k dispozici</translation>
+        <source>Mailbox unavailable</source>
+        <translation>Schránka není k dispozici</translation>
     </message>
     <message>
-      <source>Mailbox name not allowed</source>
-      <translation>Jméno schránky není povoleno</translation>
+        <source>Mailbox name not allowed</source>
+        <translation>Jméno schránky není povoleno</translation>
     </message>
     <message>
-      <source>Bad command sequence</source>
-      <translation>Špatná sekvence příkazů</translation>
+        <source>Bad command sequence</source>
+        <translation>Špatná sekvence příkazů</translation>
     </message>
     <message>
-      <source>User not local</source>
-      <translation>Uživatel není lokální</translation>
+        <source>User not local</source>
+        <translation>Uživatel není lokální</translation>
     </message>
     <message>
-      <source>Transaction failed</source>
-      <translation>Transakce selhala</translation>
+        <source>Transaction failed</source>
+        <translation>Transakce selhala</translation>
     </message>
     <message>
-      <source>Memory error</source>
-      <translation>Chyba paměti</translation>
+        <source>Memory error</source>
+        <translation>Chyba paměti</translation>
     </message>
     <message>
-      <source>Connection refused</source>
-      <translation>Připojení odmítnuto</translation>
+        <source>Connection refused</source>
+        <translation>Připojení odmítnuto</translation>
     </message>
     <message>
-      <source>Unknown error code</source>
-      <translation>Neznámý chybový kód</translation>
+        <source>Unknown error code</source>
+        <translation>Neznámý chybový kód</translation>
     </message>
     <message>
-      <source>Error sending mail</source>
-      <translation>Zprávu nelze odeslat</translation>
+        <source>Error sending mail</source>
+        <translation>Zprávu nelze odeslat</translation>
     </message>
     <message>
-      <source>Error sending queued mail - breaking</source>
-      <translation>Zprávu z fronty nelze odeslat - přerušení</translation>
+        <source>Error sending queued mail - breaking</source>
+        <translation>Zprávu z fronty nelze odeslat - přerušení</translation>
     </message>
     <message>
-      <source>Starttls not supported</source>
-      <translation>Starttls není podporováno</translation>
+        <source>Starttls not supported</source>
+        <translation>Starttls není podporováno</translation>
     </message>
     <message>
-      <source>&lt;center>%1&lt;/center></source>
-      <translation>&lt;center>%1&lt;/center></translation>
+        <source>&lt;center&gt;%1&lt;/center&gt;</source>
+        <translation>&lt;center&gt;%1&lt;/center&gt;</translation>
     </message>
     <message>
-      <source>Error init SMTP connection: %1</source>
-      <translation>Chyba inicializace SMTP spojení: %1</translation>
+        <source>Error init SMTP connection: %1</source>
+        <translation>Chyba inicializace SMTP spojení: %1</translation>
     </message>
     <message>
-      <source>Error init SMTP tls: %1</source>
-      <translation>Chyba inicializace SMTP tls: %1</translation>
+        <source>Error init SMTP tls: %1</source>
+        <translation>Chyba inicializace SMTP tls: %1</translation>
     </message>
     <message>
-      <source>Login aborted - storing mail to localfolder</source>
-      <translation>Přihlášení přerušeno - ukládání mailu do lokální složky</translation>
+        <source>Login aborted - storing mail to localfolder</source>
+        <translation>Přihlášení přerušeno - ukládání mailu do lokální složky</translation>
     </message>
     <message>
-      <source>Authentification failed</source>
-      <translation>Autentizace selhala</translation>
+        <source>Authentification failed</source>
+        <translation>Autentizace selhala</translation>
     </message>
     <message>
-      <source>Error sending mail: %1</source>
-      <translation>Chyba odesílání mailu: %1</translation>
+        <source>Error sending mail: %1</source>
+        <translation>Chyba odesílání mailu: %1</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>progressMailSend</name>
     <message>
-      <source>%1 of %2 bytes send</source>
-      <translation>Bylo odesláno %1 z %2 bajtů</translation>
+        <source>%1 of %2 bytes send</source>
+        <translation>Bylo odesláno %1 z %2 bajtů</translation>
     </message>
     <message>
-      <source>Sending mail %1 of %2</source>
-      <translation>Odesílání zprávy %1 z %2</translation>
+        <source>Sending mail %1 of %2</source>
+        <translation>Odesílání zprávy %1 z %2</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>progressMailSendUI</name>
     <message>
-      <source>Sending mail</source>
-      <translation>Odesílání zprávy</translation>
+        <source>Sending mail</source>
+        <translation>Odesílání zprávy</translation>
     </message>
     <message>
-      <source>Progress of mail</source>
-      <translation>Průběh zprávy</translation>
+        <source>Progress of mail</source>
+        <translation>Průběh zprávy</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libmemoryapplet.ts b/i18n/cz/libmemoryapplet.ts
index 744cd99..97614d6 100644
--- a/i18n/cz/libmemoryapplet.ts
+++ b/i18n/cz/libmemoryapplet.ts
@@ -1,35 +1,34 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>LoadInfo</name>
     <message>
-      <source>Application CPU usage (%)</source>
-      <translation>Zatížení CPU aplikacemi (%)</translation>
+        <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>
+        <source>System CPU usage (%)</source>
+        <translation>Zatížení CPU systémem (%)</translation>
     </message>
     <message>
-      <source>This page shows how much this device's processor is being used.</source>
-      <translation>Tato strana ukazuje vytížení procesoru tohoto zařízení.</translation>
+        <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>
+        <source>Type: </source>
+        <translation>Typ:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MemoryInfo</name>
     <message>
-      <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-      <translation>Tato strana ukazuje obsazení paměti (RAM) vašeho zařízení.
+        <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.
@@ -38,131 +37,134 @@ Paměť je kategorizována následovně:
 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>
+        <source>Total Memory: %1 kB</source>
+        <translation>Celková paměť: %1 kB</translation>
     </message>
     <message>
-      <source>Used (%1 kB)</source>
-      <translation>Used (%1 kB)</translation>
+        <source>Used (%1 kB)</source>
+        <translation>Used (%1 kB)</translation>
     </message>
     <message>
-      <source>Buffers (%1 kB)</source>
-      <translation>Buffers (%1 kB)</translation>
+        <source>Buffers (%1 kB)</source>
+        <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
-      <source>Cached (%1 kB)</source>
-      <translation>Cached (%1 kB)</translation>
+        <source>Cached (%1 kB)</source>
+        <translation>Cached (%1 kB)</translation>
     </message>
     <message>
-      <source>Free (%1 kB)</source>
-      <translation>Free (%1 kB)</translation>
+        <source>Free (%1 kB)</source>
+        <translation>Free (%1 kB)</translation>
     </message>
     <message>
-      <source>Total Swap: %1 kB</source>
-      <translation>Celkový Swap: %1 kB</translation>
+        <source>Total Swap: %1 kB</source>
+        <translation>Celkový Swap: %1 kB</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MemoryStatus</name>
     <message>
-      <source>Memory Status</source>
-      <translation>Stav paměti</translation>
+        <source>Memory Status</source>
+        <translation>Stav paměti</translation>
     </message>
     <message>
-      <source>Memory</source>
-      <translation>Paměť</translation>
+        <source>Memory</source>
+        <translation>Paměť</translation>
     </message>
     <message>
-      <source>Swapfile</source>
-      <translation>Swap soubor</translation>
+        <source>Swapfile</source>
+        <translation>Swap soubor</translation>
     </message>
     <message>
-      <source>&lt;center>&lt;b>Memory Monitor Plugin&lt;/b>&lt;br>Copyright (C) 2003 Anton Maslovsky&lt;br>&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;>my-zaurus@narod.ru&lt;/a>&amp;gt;&lt;br>&lt;a href=&quot;http://my-zaurus.narod.ru&quot;>http://my-zaurus.narod.ru&lt;/a>&lt;br>Based on source code from:&lt;br> qswap (udoseidel@gmx.de) &lt;br> Battery Applet (trolltech.com) &lt;br> SysInfo (OPIE)&lt;br>&lt;br>This program is licensed under GNU GPL.&lt;/center></source>
-      <translation>&lt;center>&lt;b>Memory Monitor Plugin&lt;/b>&lt;br>Copyright (C) 2003 Anton Maslovsky&lt;br>&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;>my-zaurus@narod.ru&lt;/a>&amp;gt;&lt;br>&lt;a href=&quot;http://my-zaurus.narod.ru&quot;>http://my-zaurus.narod.ru&lt;/a>&lt;br>Založeno na zdrojovém kódu:&lt;br> qswap (udoseidel@gmx.de) &lt;br> Battery Applet (trolltech.com) &lt;br> SysInfo (OPIE)&lt;br>&lt;br>Tento program je licencován pod GNU GPL.&lt;/center></translation>
+        <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>
+        <source>About</source>
+        <translation>O aplikaci</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Swapfile</name>
     <message>
-      <source>Swapfile location</source>
-      <translation>Umístění swap souboru</translation>
+        <source>Swapfile location</source>
+        <translation>Umístění swap souboru</translation>
     </message>
     <message>
-      <source>RAM</source>
-      <translation>RAM</translation>
+        <source>RAM</source>
+        <translation>RAM</translation>
     </message>
     <message>
-      <source>CF Card</source>
-      <translation>Karta CF</translation>
+        <source>CF Card</source>
+        <translation>Karta CF</translation>
     </message>
     <message>
-      <source>SD Card</source>
-      <translation>Karta SD</translation>
+        <source>SD Card</source>
+        <translation>Karta SD</translation>
     </message>
     <message>
-      <source> On </source>
-      <translation>Zapnout</translation>
+        <source> On </source>
+        <translation>Zapnout</translation>
     </message>
     <message>
-      <source> Off </source>
-      <translation>Vypnout</translation>
+        <source> Off </source>
+        <translation>Vypnout</translation>
     </message>
     <message>
-      <source>Manage Swapfile</source>
-      <translation>Správa swap souboru</translation>
+        <source>Manage Swapfile</source>
+        <translation>Správa swap souboru</translation>
     </message>
     <message>
-      <source>Generate</source>
-      <translation>Vytvořit</translation>
+        <source>Generate</source>
+        <translation>Vytvořit</translation>
     </message>
     <message>
-      <source>Remove</source>
-      <translation>Odstranit</translation>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
     <message>
-      <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-      <translation>2 MB,4 MB,6 MB,8 MB</translation>
+        <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>
+        <source>Failed to detach swapfile.</source>
+        <translation>Selhalo odpojení swap souboru.</translation>
     </message>
     <message>
-      <source>Swapfile deactivated.</source>
-      <translation>Soubor swap deaktivován.</translation>
+        <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>
+        <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>
+        <source>Failed to initialize swapfile.</source>
+        <translation>Nelze inicializovat swap soubor.</translation>
     </message>
     <message>
-      <source>Swapfile created.</source>
-      <translation>Swap soubor vytvořen.</translation>
+        <source>Swapfile created.</source>
+        <translation>Swap soubor vytvořen.</translation>
     </message>
     <message>
-      <source>Failed to remove swapfile.</source>
-      <translation>Nelze odstranit swap soubor.</translation>
+        <source>Failed to remove swapfile.</source>
+        <translation>Nelze odstranit swap soubor.</translation>
     </message>
     <message>
-      <source>Swapfile removed.</source>
-      <translation>Swap soubor odstraněn.</translation>
+        <source>Swapfile removed.</source>
+        <translation>Swap soubor odstraněn.</translation>
     </message>
     <message>
-      <source>Swapfile activated.</source>
-      <translation>Swap soubor aktivován.</translation>
+        <source>Swapfile activated.</source>
+        <translation>Swap soubor aktivován.</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation></translation>
     </message>
-  </context>
+    <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/cz/libmodem.ts b/i18n/cz/libmodem.ts
index d8ba818..a8eaaee 100644
--- a/i18n/cz/libmodem.ts
+++ b/i18n/cz/libmodem.ts
@@ -1,37 +1,36 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>ModemGUI</name>
     <message>
-      <source>Modem</source>
-      <translation>Modem</translation>
+        <source>Modem</source>
+        <translation>Modem</translation>
     </message>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Description</source>
-      <translation>Popis</translation>
+        <source>Description</source>
+        <translation>Popis</translation>
     </message>
     <message>
-      <source>Start automatically</source>
-      <translation>Spustit automaticky</translation>
+        <source>Start automatically</source>
+        <translation>Spustit automaticky</translation>
     </message>
     <message>
-      <source>Confirm before start</source>
-      <translation>Potvrdit před spuštěním</translation>
+        <source>Confirm before start</source>
+        <translation>Potvrdit před spuštěním</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ModemNetNode</name>
     <message>
-      <source>Dialup modem</source>
-      <translation>Vytáčený modem</translation>
+        <source>Dialup modem</source>
+        <translation>Vytáčený modem</translation>
     </message>
     <message>
-      <source>&lt;p>Sets up a dialing procedures.&lt;/p>&lt;p>Use this to dial up over modems, ISDN, GSM, ...&lt;/p></source>
-      <translation>&lt;p>Nastaví vytáčecí procedury.&lt;/p>&lt;p>Požijte pro vytáčená spojení pomocí modemů, ISDN, GSM, ...&lt;/p></translation>
+        <source>&lt;p&gt;Sets up a dialing procedures.&lt;/p&gt;&lt;p&gt;Use this to dial up over modems, ISDN, GSM, ...&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Nastaví vytáčecí procedury.&lt;/p&gt;&lt;p&gt;Požijte pro vytáčená spojení pomocí modemů, ISDN, GSM, ...&lt;/p&gt;</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libmultiauthbluepingplugin.ts b/i18n/cz/libmultiauthbluepingplugin.ts
index 7adbebf..2670461 100644
--- a/i18n/cz/libmultiauthbluepingplugin.ts
+++ b/i18n/cz/libmultiauthbluepingplugin.ts
@@ -1,42 +1,41 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>BluepingConfigWidget</name>
     <message>
-      <source>Set the MAC address to ping here</source>
-      <translation>Zde nastavte MAC adresu, na kterou chcete pingnout</translation>
+        <source>Set the MAC address to ping here</source>
+        <translation>Zde nastavte MAC adresu, na kterou chcete pingnout</translation>
     </message>
     <message>
-      <source>Set</source>
-      <translation>Nastavit</translation>
+        <source>Set</source>
+        <translation>Nastavit</translation>
     </message>
     <message>
-      <source>Detecting another Bluetooth device by its MAC address provides a minimal and automatic level of protection.</source>
-      <translation>Detekce jiného Bluetooth zařízení pomocí jeho MAC adresy poskytuje minimální a automatickou úroveň ochrany.</translation>
+        <source>Detecting another Bluetooth device by its MAC address provides a minimal and automatic level of protection.</source>
+        <translation>Detekce jiného Bluetooth zařízení pomocí jeho MAC adresy poskytuje minimální a automatickou úroveň ochrany.</translation>
     </message>
     <message>
-      <source>Note: if you don't put a valid MAC here but you activate the plugin, it will always succeed!</source>
-      <translation>Poznámka: Jestliže nezadáte správnou MAC adresu, ale aktivujete plugin, tak ten bude vždy úspěšný.</translation>
+        <source>Note: if you don&apos;t put a valid MAC here but you activate the plugin, it will always succeed!</source>
+        <translation>Poznámka: Jestliže nezadáte správnou MAC adresu, ale aktivujete plugin, tak ten bude vždy úspěšný.</translation>
     </message>
     <message>
-      <source>MAC address saved!</source>
-      <translation>MAC adresa uložena!</translation>
+        <source>MAC address saved!</source>
+        <translation>MAC adresa uložena!</translation>
     </message>
     <message>
-      <source>Make sure that Bluetooth is turned on on the corresponding device when the Blueping plugin needs it.</source>
-      <translation>Ujistěte se, že Bluetooth je zapnutý na odpovídajícím zařízení, když ho Blueping plugin potřebuje.</translation>
+        <source>Make sure that Bluetooth is turned on on the corresponding device when the Blueping plugin needs it.</source>
+        <translation>Ujistěte se, že Bluetooth je zapnutý na odpovídajícím zařízení, když ho Blueping plugin potřebuje.</translation>
     </message>
     <message>
-      <source>Please enter a valid MAC</source>
-      <translation>Prosím zadejte platnou MAC adresu</translation>
+        <source>Please enter a valid MAC</source>
+        <translation>Prosím zadejte platnou MAC adresu</translation>
     </message>
     <message>
-      <source>Please separate the six pairs of digits of your MAC like this: 01:02:03:04:05:06</source>
-      <translation>Prosím oddělte šest párů číslic vaší MAC adresy asi takto: 01:02:03:04:05:06</translation>
+        <source>Please separate the six pairs of digits of your MAC like this: 01:02:03:04:05:06</source>
+        <translation>Prosím oddělte šest párů číslic vaší MAC adresy asi takto: 01:02:03:04:05:06</translation>
     </message>
     <message>
-      <source>&lt;/p></source>
-      <translation>&lt;/p></translation>
+        <source>&lt;/p&gt;</source>
+        <translation>&lt;/p&gt;</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libmultiauthdummyplugin.ts b/i18n/cz/libmultiauthdummyplugin.ts
index 971d2e3..6ac98a0 100644
--- a/i18n/cz/libmultiauthdummyplugin.ts
+++ b/i18n/cz/libmultiauthdummyplugin.ts
@@ -1,14 +1,13 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>DummyPlugin</name>
     <message>
-      <source>&quot;Dummy&quot; &lt;br />demonstration plugin</source>
-      <translation>&quot;Dummy&quot; &lt;br />demonstrační plugin</translation>
+        <source>&quot;Dummy&quot; &lt;br /&gt;demonstration plugin</source>
+        <translation>&quot;Dummy&quot; &lt;br /&gt;demonstrační plugin</translation>
     </message>
     <message>
-      <source>You can simulate the following outcomes:</source>
-      <translation>Můžete simulovat následující výstupy:</translation>
+        <source>You can simulate the following outcomes:</source>
+        <translation>Můžete simulovat následující výstupy:</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libmultiauthnoticeplugin.ts b/i18n/cz/libmultiauthnoticeplugin.ts
index 2b94f46..465364a 100644
--- a/i18n/cz/libmultiauthnoticeplugin.ts
+++ b/i18n/cz/libmultiauthnoticeplugin.ts
@@ -1,40 +1,39 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>NoticeConfigWidget</name>
     <message>
-      <source>Set the message the user must accept</source>
-      <translation>Nastaví zprávu, kterou musí uživatel akceptovat</translation>
+        <source>Set the message the user must accept</source>
+        <translation>Nastaví zprávu, kterou musí uživatel akceptovat</translation>
     </message>
     <message>
-      <source>You may want to consult your legal department for proper wording here.</source>
-      <translation>Správné znění můžete prokonzultovat s vaším právním oddělením.</translation>
+        <source>You may want to consult your legal department for proper wording here.</source>
+        <translation>Správné znění můžete prokonzultovat s vaším právním oddělením.</translation>
     </message>
     <message>
-      <source>Reset notice to default</source>
-      <translation>Vrátit oznámení do výchozího stavu</translation>
+        <source>Reset notice to default</source>
+        <translation>Vrátit oznámení do výchozího stavu</translation>
     </message>
     <message>
-      <source>Note: you can use HTML tags to improve its layout (example: text between &amp;lt;em&amp;gt; and &amp;lt;/em&amp;gt; will be &lt;em>emphasized&lt;/em>)</source>
-      <translation>Poznámka:můžete použít HTML tágy pro zlepšení vzhledu (příklad: text mezi &amp;lt;em&amp;gt; a &amp;lt;/em&amp;gt; bude &lt;em>zvýrazněn&lt;/em>)</translation>
+        <source>Note: you can use HTML tags to improve its layout (example: text between &amp;lt;em&amp;gt; and &amp;lt;/em&amp;gt; will be &lt;em&gt;emphasized&lt;/em&gt;)</source>
+        <translation>Poznámka:můžete použít HTML tágy pro zlepšení vzhledu (příklad: text mezi &amp;lt;em&amp;gt; a &amp;lt;/em&amp;gt; bude &lt;em&gt;zvýrazněn&lt;/em&gt;)</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>NoticePlugin</name>
     <message>
-      <source>I accept</source>
-      <translation>Souhlasím</translation>
+        <source>I accept</source>
+        <translation>Souhlasím</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>&lt;h2>NOTICE TO USERS&lt;/h2>
-&lt;p>This is a private computer system and is the property of the company XXX / Mr or Ms X. It is for authorized use only. Users have no expectation of privacy.&lt;/p>
-&lt;p>&lt;strong>Unauthorized or improper use of this system may result in disciplinary action and civil and criminal penalties. &lt;em>By continuing to use this system you indicate your awareness of and consent to these terms. LOG OFF IMMEDIATELY if you do not agree to them.&lt;/em>&lt;/strong>&lt;/p></source>
-      <translation>&lt;h2>OZNÁMENÍ UŽIVATELŮM&lt;/h2>
-&lt;p>Toto je soukromý počítačový systém a je majetkem společnosti XXX / pana nebo paní X. Je určen jen pro schválené použití. Uživatelé nemohou očekávat soukromí.&lt;/p>
-&lt;p>&lt;strong>Neschválené, nebo nesprávné použití může vyůstit v disciplinární postih a právní a soudní řízení. &lt;em>Dalším používáním systému dáváte najevo, že souhlasíte s těmito pravidly. OKAMŽITĚ se odhlašte, jestliže s nimi nesouhlasíte.&lt;/em>&lt;/strong>&lt;/p></translation>
+        <source>&lt;h2&gt;NOTICE TO USERS&lt;/h2&gt;
+&lt;p&gt;This is a private computer system and is the property of the company XXX / Mr or Ms X. It is for authorized use only. Users have no expectation of privacy.&lt;/p&gt;
+&lt;p&gt;&lt;strong&gt;Unauthorized or improper use of this system may result in disciplinary action and civil and criminal penalties. &lt;em&gt;By continuing to use this system you indicate your awareness of and consent to these terms. LOG OFF IMMEDIATELY if you do not agree to them.&lt;/em&gt;&lt;/strong&gt;&lt;/p&gt;</source>
+        <translation>&lt;h2&gt;OZNÁMENÍ UŽIVATELŮM&lt;/h2&gt;
+&lt;p&gt;Toto je soukromý počítačový systém a je majetkem společnosti XXX / pana nebo paní X. Je určen jen pro schválené použití. Uživatelé nemohou očekávat soukromí.&lt;/p&gt;
+&lt;p&gt;&lt;strong&gt;Neschválené, nebo nesprávné použití může vyůstit v disciplinární postih a právní a soudní řízení. &lt;em&gt;Dalším používáním systému dáváte najevo, že souhlasíte s těmito pravidly. OKAMŽITĚ se odhlašte, jestliže s nimi nesouhlasíte.&lt;/em&gt;&lt;/strong&gt;&lt;/p&gt;</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libmultiauthpinplugin.ts b/i18n/cz/libmultiauthpinplugin.ts
index 4cded84..3a78f35 100644
--- a/i18n/cz/libmultiauthpinplugin.ts
+++ b/i18n/cz/libmultiauthpinplugin.ts
@@ -1,92 +1,91 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>PinConfigWidget</name>
     <message>
-      <source>Configure your PIN here</source>
-      <translation>Zde nastavíte váš PIN</translation>
+        <source>Configure your PIN here</source>
+        <translation>Zde nastavíte váš PIN</translation>
     </message>
     <message>
-      <source>PIN protection provides a minimal level of protection from casual access to this device.</source>
-      <translation>Ochrana PINem poskytuje minimální úroveň ochrany před náhodným přístupem k tomuto zařízení.</translation>
+        <source>PIN protection provides a minimal level of protection from casual access to this device.</source>
+        <translation>Ochrana PINem poskytuje minimální úroveň ochrany před náhodným přístupem k tomuto zařízení.</translation>
     </message>
     <message>
-      <source>Change PIN</source>
-      <translation>Změnit PIN</translation>
+        <source>Change PIN</source>
+        <translation>Změnit PIN</translation>
     </message>
     <message>
-      <source>Clear PIN</source>
-      <translation>Smazat PIN</translation>
+        <source>Clear PIN</source>
+        <translation>Smazat PIN</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PinDialogBase</name>
     <message>
-      <source>PinDialogBase</source>
-      <translation>PinDialogBase</translation>
+        <source>PinDialogBase</source>
+        <translation>PinDialogBase</translation>
     </message>
     <message>
-      <source>4</source>
-      <translation>4</translation>
+        <source>4</source>
+        <translation>4</translation>
     </message>
     <message>
-      <source>7</source>
-      <translation>7</translation>
+        <source>7</source>
+        <translation>7</translation>
     </message>
     <message>
-      <source>Enter your PIN</source>
-      <translation>Zadejte váš PIN</translation>
+        <source>Enter your PIN</source>
+        <translation>Zadejte váš PIN</translation>
     </message>
     <message>
-      <source>1</source>
-      <translation>1</translation>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
-      <source>2</source>
-      <translation>2</translation>
+        <source>2</source>
+        <translation>2</translation>
     </message>
     <message>
-      <source>5</source>
-      <translation>5</translation>
+        <source>5</source>
+        <translation>5</translation>
     </message>
     <message>
-      <source>6</source>
-      <translation>6</translation>
+        <source>6</source>
+        <translation>6</translation>
     </message>
     <message>
-      <source>3</source>
-      <translation>3</translation>
+        <source>3</source>
+        <translation>3</translation>
     </message>
     <message>
-      <source>0</source>
-      <translation>0</translation>
+        <source>0</source>
+        <translation>0</translation>
     </message>
     <message>
-      <source>8</source>
-      <translation>8</translation>
+        <source>8</source>
+        <translation>8</translation>
     </message>
     <message>
-      <source>9</source>
-      <translation>9</translation>
+        <source>9</source>
+        <translation>9</translation>
     </message>
     <message>
-      <source>Enter</source>
-      <translation>Vložit</translation>
+        <source>Enter</source>
+        <translation>Vložit</translation>
     </message>
     <message>
-      <source>Skip</source>
-      <translation>Přeskočit</translation>
+        <source>Skip</source>
+        <translation>Přeskočit</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Enter new PIN</source>
-      <translation>Zadejte nový PIN</translation>
+        <source>Enter new PIN</source>
+        <translation>Zadejte nový PIN</translation>
     </message>
     <message>
-      <source>Re-enter new PIN</source>
-      <translation>Zadejte znovu nový PIN</translation>
+        <source>Re-enter new PIN</source>
+        <translation>Zadejte znovu nový PIN</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libnetwork.ts b/i18n/cz/libnetwork.ts
index 0d68674..4a14d39 100644
--- a/i18n/cz/libnetwork.ts
+++ b/i18n/cz/libnetwork.ts
@@ -1,132 +1,131 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>NetworkEdit</name>
     <message>
-      <source>Hostname needed</source>
-      <translation>Vyžadováno jméno hostitele</translation>
+        <source>Hostname needed</source>
+        <translation>Vyžadováno jméno hostitele</translation>
     </message>
     <message>
-      <source>IPAddress needed</source>
-      <translation>Vyžadována IP adresa</translation>
+        <source>IPAddress needed</source>
+        <translation>Vyžadována IP adresa</translation>
     </message>
     <message>
-      <source>Broadcast needed</source>
-      <translation>Vyžadována Broadcast adresa</translation>
+        <source>Broadcast needed</source>
+        <translation>Vyžadována Broadcast adresa</translation>
     </message>
     <message>
-      <source>Subnet mask needed</source>
-      <translation>Vyžadována síťová maska</translation>
+        <source>Subnet mask needed</source>
+        <translation>Vyžadována síťová maska</translation>
     </message>
     <message>
-      <source>IPAddress not valid</source>
-      <translation>IP adresa je neplatná</translation>
+        <source>IPAddress not valid</source>
+        <translation>IP adresa je neplatná</translation>
     </message>
     <message>
-      <source>Subnet mask not valid</source>
-      <translation>Síťová maska je neplatná</translation>
+        <source>Subnet mask not valid</source>
+        <translation>Síťová maska je neplatná</translation>
     </message>
     <message>
-      <source>Broadcast address not valid</source>
-      <translation>Broadcast adresa je neplatná</translation>
+        <source>Broadcast address not valid</source>
+        <translation>Broadcast adresa je neplatná</translation>
     </message>
     <message>
-      <source>Gateway address not valid</source>
-      <translation>Adresa brány je neplatná</translation>
+        <source>Gateway address not valid</source>
+        <translation>Adresa brány je neplatná</translation>
     </message>
     <message>
-      <source>DNS1 address not valid</source>
-      <translation>Adresa DNS1 je neplatná</translation>
+        <source>DNS1 address not valid</source>
+        <translation>Adresa DNS1 je neplatná</translation>
     </message>
     <message>
-      <source>DNS2 address not valid</source>
-      <translation>Adresa DNS2 je neplatná</translation>
+        <source>DNS2 address not valid</source>
+        <translation>Adresa DNS2 je neplatná</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>NetworkGUI</name>
     <message>
-      <source>Interface Configuration</source>
-      <translation>konfigurace rozhraní</translation>
+        <source>Interface Configuration</source>
+        <translation>konfigurace rozhraní</translation>
     </message>
     <message>
-      <source>Setup</source>
-      <translation>Nastavení</translation>
+        <source>Setup</source>
+        <translation>Nastavení</translation>
     </message>
     <message>
-      <source>Address from server</source>
-      <translation>Adresa ze serveru</translation>
+        <source>Address from server</source>
+        <translation>Adresa ze serveru</translation>
     </message>
     <message>
-      <source>IP Address</source>
-      <translation>IP adresa</translation>
+        <source>IP Address</source>
+        <translation>IP adresa</translation>
     </message>
     <message>
-      <source>Subnet Mask</source>
-      <translation>Síťová maska</translation>
+        <source>Subnet Mask</source>
+        <translation>Síťová maska</translation>
     </message>
     <message>
-      <source>First DNS</source>
-      <translation>První DNS</translation>
+        <source>First DNS</source>
+        <translation>První DNS</translation>
     </message>
     <message>
-      <source>Gateway</source>
-      <translation>Brána</translation>
+        <source>Gateway</source>
+        <translation>Brána</translation>
     </message>
     <message>
-      <source>Broadcast</source>
-      <translation>Broadcast</translation>
+        <source>Broadcast</source>
+        <translation>Broadcast</translation>
     </message>
     <message>
-      <source>Second DNS</source>
-      <translation>Druhé DNS</translation>
+        <source>Second DNS</source>
+        <translation>Druhé DNS</translation>
     </message>
     <message>
-      <source>255.255.255.0</source>
-      <translation>255.255.255.0</translation>
+        <source>255.255.255.0</source>
+        <translation>255.255.255.0</translation>
     </message>
     <message>
-      <source>DHCP Settings</source>
-      <translation>Nastavení DHCP</translation>
+        <source>DHCP Settings</source>
+        <translation>Nastavení DHCP</translation>
     </message>
     <message>
-      <source>Send hostname</source>
-      <translation>Posílat jméno hostitele</translation>
+        <source>Send hostname</source>
+        <translation>Posílat jméno hostitele</translation>
     </message>
     <message>
-      <source>Extra commands</source>
-      <translation>Extra příkazy</translation>
+        <source>Extra commands</source>
+        <translation>Extra příkazy</translation>
     </message>
     <message>
-      <source>Pre-Up</source>
-      <translation>Před nahozením</translation>
+        <source>Pre-Up</source>
+        <translation>Před nahozením</translation>
     </message>
     <message>
-      <source>...</source>
-      <translation>...</translation>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-      <source>Post-Up</source>
-      <translation>Po nahození</translation>
+        <source>Post-Up</source>
+        <translation>Po nahození</translation>
     </message>
     <message>
-      <source>Pre-Down</source>
-      <translation>Před schozením</translation>
+        <source>Pre-Down</source>
+        <translation>Před schozením</translation>
     </message>
     <message>
-      <source>Post-Down</source>
-      <translation>Po schození</translation>
+        <source>Post-Down</source>
+        <translation>Po schození</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>NetworkNetNode</name>
     <message>
-      <source>IP Configuration</source>
-      <translation>Konfigurace IP</translation>
+        <source>IP Configuration</source>
+        <translation>Konfigurace IP</translation>
     </message>
     <message>
-      <source>&lt;p>Sets up TCP/IP options.&lt;/p>&lt;p>Use this to configure the TCP/IP protocol&lt;/p></source>
-      <translation>&lt;p>Nastaví možnosti TCP/IP.&lt;/p>&lt;p>Toto použijte pro konfiguraci TCP/IP protokolu&lt;/p></translation>
+        <source>&lt;p&gt;Sets up TCP/IP options.&lt;/p&gt;&lt;p&gt;Use this to configure the TCP/IP protocol&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Nastaví možnosti TCP/IP.&lt;/p&gt;&lt;p&gt;Toto použijte pro konfiguraci TCP/IP protokolu&lt;/p&gt;</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libnetworksettings2.ts b/i18n/cz/libnetworksettings2.ts
index 4e31be2..98c745c 100644
--- a/i18n/cz/libnetworksettings2.ts
+++ b/i18n/cz/libnetworksettings2.ts
@@ -1,72 +1,111 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>System</name>
     <message>
-      <source>Command : </source>
-      <translation>Příkaz : </translation>
+        <source>Command : </source>
+        <translation>Příkaz : </translation>
     </message>
-  </context>
-  <context>
+    <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>Síťové zařízení</translation>
+        <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>Character device</source>
-      <translation>Znakové zařízení</translation>
+        <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>IP Connection</source>
-      <translation>IP připojení</translation>
+        <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>Connection Profile</source>
-      <translation>Profil připojení</translation>
+        <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>Devices that can handle IP packets&lt;/p></source>
-      <translation>&lt;p>Zařízení, která rozumí IP paketům&lt;/p></translation>
+        <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>Devices that can handle single bytes&lt;/p></source>
-      <translation>&lt;p>Zařízení, která rozumí jednotlivým znakům&lt;/p></translation>
+        <source>&lt;p&gt;Nodes that provide working IP connection&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>&lt;p>Nodes that provide working IP connections&lt;/p></source>
-      <translation>&lt;p>Uzly, které poskytují funkční IP připojení&lt;/p></translation>
+        <source>&lt;p&gt;Fully configured network profile&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>&lt;p>Fully configured connection profile&lt;/p></source>
-      <translation>&lt;p>Plně nastaven profil připojení&lt;/p></translation>
+        <source>Connection to GPRS device</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+    <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>Neznámý</translation>
+        <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>Unavailable</source>
-      <translation>Nedostupný</translation>
+        <source>Off</source>
+        <translation type="obsolete">Vypnutý</translation>
     </message>
     <message>
-      <source>Disabled</source>
-      <translation>Zablokovaný</translation>
+        <source>Available</source>
+        <translation>Dostupný</translation>
     </message>
     <message>
-      <source>Off</source>
-      <translation>Vypnutý</translation>
+        <source>IsUp</source>
+        <translation type="obsolete">Nahozen</translation>
     </message>
     <message>
-      <source>Available</source>
-      <translation>Dostupný</translation>
+        <source>Inactive</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>IsUp</source>
-      <translation>Nahozen</translation>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libopiecore2.ts b/i18n/cz/libopiecore2.ts
index af02836..91be17f 100644
--- a/i18n/cz/libopiecore2.ts
+++ b/i18n/cz/libopiecore2.ts
@@ -1,89 +1,88 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>Button</name>
     <message>
-      <source>Calendar Button</source>
-      <translation>Tlačítko kalendář</translation>
+        <source>Calendar Button</source>
+        <translation>Tlačítko kalendář</translation>
     </message>
     <message>
-      <source>Contacts Button</source>
-      <translation>Tlačítko kontakty</translation>
+        <source>Contacts Button</source>
+        <translation>Tlačítko kontakty</translation>
     </message>
     <message>
-      <source>Menu Button</source>
-      <translation>Tlačítko Menu</translation>
+        <source>Menu Button</source>
+        <translation>Tlačítko Menu</translation>
     </message>
     <message>
-      <source>Mail Button</source>
-      <translation>Tlačítko Mail</translation>
+        <source>Mail Button</source>
+        <translation>Tlačítko Mail</translation>
     </message>
     <message>
-      <source>Home Button</source>
-      <translation>Tlačítko Domů</translation>
+        <source>Home Button</source>
+        <translation>Tlačítko Domů</translation>
     </message>
     <message>
-      <source>Record Button</source>
-      <translation>Tlačítko Záznam</translation>
+        <source>Record Button</source>
+        <translation>Tlačítko Záznam</translation>
     </message>
     <message>
-      <source>Lower+Up</source>
-      <translation>Dolní+Nahoru</translation>
+        <source>Lower+Up</source>
+        <translation>Dolní+Nahoru</translation>
     </message>
     <message>
-      <source>Lower+Down</source>
-      <translation>Dolní+Dolů</translation>
+        <source>Lower+Down</source>
+        <translation>Dolní+Dolů</translation>
     </message>
     <message>
-      <source>Lower+Right</source>
-      <translation>Dolní+Vpravo</translation>
+        <source>Lower+Right</source>
+        <translation>Dolní+Vpravo</translation>
     </message>
     <message>
-      <source>Lower+Left</source>
-      <translation>Dolní+Vlevo</translation>
+        <source>Lower+Left</source>
+        <translation>Dolní+Vlevo</translation>
     </message>
     <message>
-      <source>Upper+Up</source>
-      <translation>Horní+Nahoru</translation>
+        <source>Upper+Up</source>
+        <translation>Horní+Nahoru</translation>
     </message>
     <message>
-      <source>Upper+Down</source>
-      <translation>Horní+Dolů</translation>
+        <source>Upper+Down</source>
+        <translation>Horní+Dolů</translation>
     </message>
     <message>
-      <source>Upper+Right</source>
-      <translation>Horní+Vpravo</translation>
+        <source>Upper+Right</source>
+        <translation>Horní+Vpravo</translation>
     </message>
     <message>
-      <source>Upper+Left</source>
-      <translation>Horní+Vlevo</translation>
+        <source>Upper+Left</source>
+        <translation>Horní+Vlevo</translation>
     </message>
     <message>
-      <source>Display Rotate</source>
-      <translation>Rotace displeje</translation>
+        <source>Display Rotate</source>
+        <translation>Rotace displeje</translation>
     </message>
     <message>
-      <source>Action Button</source>
-      <translation>Akční tlačítko</translation>
+        <source>Action Button</source>
+        <translation>Akční tlačítko</translation>
     </message>
     <message>
-      <source>OK Button</source>
-      <translation>Tlačítko OK</translation>
+        <source>OK Button</source>
+        <translation>Tlačítko OK</translation>
     </message>
     <message>
-      <source>End Button</source>
-      <translation>Tlačítko End</translation>
+        <source>End Button</source>
+        <translation>Tlačítko End</translation>
     </message>
     <message>
-      <source>Todo Button</source>
-      <translation>Tlačítko Todo</translation>
+        <source>Todo Button</source>
+        <translation>Tlačítko Todo</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Trash</source>
-      <translation>Koš</translation>
+        <source>Trash</source>
+        <translation>Koš</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libopiemm2.ts b/i18n/cz/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/cz/libopiemm2.ts
+++ b/i18n/cz/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/cz/libopiepim2.ts b/i18n/cz/libopiepim2.ts
index 65256d0..894c9e6 100644
--- a/i18n/cz/libopiepim2.ts
+++ b/i18n/cz/libopiepim2.ts
@@ -1,628 +1,758 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>OPimRecurrenceBase</name>
     <message>
-      <source>Repeating Event </source>
-      <translation>Opakující se událost</translation>
+        <source>Repeating Event </source>
+        <translation>Opakující se událost</translation>
     </message>
     <message>
-      <source>None</source>
-      <translation>Žádný</translation>
+        <source>None</source>
+        <translation>Žádný</translation>
     </message>
     <message>
-      <source>Day</source>
-      <translation>Den</translation>
+        <source>Day</source>
+        <translation>Den</translation>
     </message>
     <message>
-      <source>Week</source>
-      <translation>Týden</translation>
+        <source>Week</source>
+        <translation>Týden</translation>
     </message>
     <message>
-      <source>Month</source>
-      <translation>Měsíc</translation>
+        <source>Month</source>
+        <translation>Měsíc</translation>
     </message>
     <message>
-      <source>Year</source>
-      <translation>Rok</translation>
+        <source>Year</source>
+        <translation>Rok</translation>
     </message>
     <message>
-      <source>Every:</source>
-      <translation>Každý:</translation>
+        <source>Every:</source>
+        <translation>Každý:</translation>
     </message>
     <message>
-      <source>Frequency</source>
-      <translation>Frekvence</translation>
+        <source>Frequency</source>
+        <translation>Frekvence</translation>
     </message>
     <message>
-      <source>End On:</source>
-      <translation>Končit v:</translation>
+        <source>End On:</source>
+        <translation>Končit v:</translation>
     </message>
     <message>
-      <source>No End Date</source>
-      <translation>Bez konečného data</translation>
+        <source>No End Date</source>
+        <translation>Bez konečného data</translation>
     </message>
     <message>
-      <source>Repeat On</source>
-      <translation>Opakovat v</translation>
+        <source>Repeat On</source>
+        <translation>Opakovat v</translation>
     </message>
     <message>
-      <source>Mon</source>
-      <translation>Pon</translation>
+        <source>Mon</source>
+        <translation>Pon</translation>
     </message>
     <message>
-      <source>Tue</source>
-      <translation>Úte</translation>
+        <source>Tue</source>
+        <translation>Úte</translation>
     </message>
     <message>
-      <source>Wed</source>
-      <translation>Stř</translation>
+        <source>Wed</source>
+        <translation>Stř</translation>
     </message>
     <message>
-      <source>Thu</source>
-      <translation>Čtv</translation>
+        <source>Thu</source>
+        <translation>Čtv</translation>
     </message>
     <message>
-      <source>Fri</source>
-      <translation>Pát</translation>
+        <source>Fri</source>
+        <translation>Pát</translation>
     </message>
     <message>
-      <source>Sat</source>
-      <translation>Sob</translation>
+        <source>Sat</source>
+        <translation>Sob</translation>
     </message>
     <message>
-      <source>Sun</source>
-      <translation>Ned</translation>
+        <source>Sun</source>
+        <translation>Ned</translation>
     </message>
     <message>
-      <source>Every</source>
-      <translation>Každý</translation>
+        <source>Every</source>
+        <translation>Každý</translation>
     </message>
     <message>
-      <source>Var1</source>
-      <translation>Var1</translation>
+        <source>Var1</source>
+        <translation>Var1</translation>
     </message>
     <message>
-      <source>Var 2</source>
-      <translation>Var 2</translation>
+        <source>Var 2</source>
+        <translation>Var 2</translation>
     </message>
     <message>
-      <source>WeekVar</source>
-      <translation>WeekVar</translation>
+        <source>WeekVar</source>
+        <translation>WeekVar</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>OPimRecurrenceWidget</name>
     <message>
-      <source>No End Date</source>
-      <translation>Bez konečného data</translation>
+        <source>No End Date</source>
+        <translation>Bez konečného data</translation>
     </message>
     <message>
-      <source>days</source>
-      <translation>dnů</translation>
+        <source>days</source>
+        <translation>dnů</translation>
     </message>
     <message>
-      <source>day</source>
-      <translation>den</translation>
+        <source>day</source>
+        <translation>den</translation>
     </message>
     <message>
-      <source>weeks</source>
-      <translation>týdnů</translation>
+        <source>weeks</source>
+        <translation>týdnů</translation>
     </message>
     <message>
-      <source>week</source>
-      <translation>týden</translation>
+        <source>week</source>
+        <translation>týden</translation>
     </message>
     <message>
-      <source>months</source>
-      <translation>měsíců</translation>
+        <source>months</source>
+        <translation>měsíců</translation>
     </message>
     <message>
-      <source>month</source>
-      <translation>měsíc</translation>
+        <source>month</source>
+        <translation>měsíc</translation>
     </message>
     <message>
-      <source>years</source>
-      <translation>let</translation>
+        <source>years</source>
+        <translation>let</translation>
     </message>
     <message>
-      <source>year</source>
-      <translation>rok</translation>
+        <source>year</source>
+        <translation>rok</translation>
     </message>
     <message>
-      <source> and </source>
-      <translation>a</translation>
+        <source> and </source>
+        <translation>a</translation>
     </message>
     <message>
-      <source>,
+        <source>,
 and </source>
-      <translation>, a</translation>
+        <translation>, a</translation>
     </message>
     <message>
-      <source>, and </source>
-      <translation>, a</translation>
+        <source>, and </source>
+        <translation>, a</translation>
     </message>
     <message>
-      <source>on </source>
-      <translation>v</translation>
+        <source>on </source>
+        <translation>v</translation>
     </message>
     <message>
-      <source>No Repeat</source>
-      <translation>bez opakování</translation>
+        <source>No Repeat</source>
+        <translation>bez opakování</translation>
     </message>
     <message>
-      <source>day(s)</source>
-      <translation>dny</translation>
+        <source>day(s)</source>
+        <translation>dny</translation>
     </message>
     <message>
-      <source>Repeat On</source>
-      <translation>Opakovat v</translation>
+        <source>Repeat On</source>
+        <translation>Opakovat v</translation>
     </message>
     <message>
-      <source>Mon</source>
-      <translation>Pon</translation>
+        <source>Mon</source>
+        <translation>Pon</translation>
     </message>
     <message>
-      <source>Tue</source>
-      <translation>Úte</translation>
+        <source>Tue</source>
+        <translation>Úte</translation>
     </message>
     <message>
-      <source>Wed</source>
-      <translation>Stř</translation>
+        <source>Wed</source>
+        <translation>Stř</translation>
     </message>
     <message>
-      <source>Thu</source>
-      <translation>Čtv</translation>
+        <source>Thu</source>
+        <translation>Čtv</translation>
     </message>
     <message>
-      <source>Fri</source>
-      <translation>Pát</translation>
+        <source>Fri</source>
+        <translation>Pát</translation>
     </message>
     <message>
-      <source>Sat</source>
-      <translation>Sob</translation>
+        <source>Sat</source>
+        <translation>Sob</translation>
     </message>
     <message>
-      <source>Sun</source>
-      <translation>Ned</translation>
+        <source>Sun</source>
+        <translation>Ned</translation>
     </message>
     <message>
-      <source>week(s)</source>
-      <translation>týdnů</translation>
+        <source>week(s)</source>
+        <translation>týdnů</translation>
     </message>
     <message>
-      <source>Repeat By</source>
-      <translation>Opakovat dle</translation>
+        <source>Repeat By</source>
+        <translation>Opakovat dle</translation>
     </message>
     <message>
-      <source>Day</source>
-      <translation>Den</translation>
+        <source>Day</source>
+        <translation>Den</translation>
     </message>
     <message>
-      <source>Date</source>
-      <translation>Datum</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-      <source>month(s)</source>
-      <translation>měsíce</translation>
+        <source>month(s)</source>
+        <translation>měsíce</translation>
     </message>
     <message>
-      <source>year(s)</source>
-      <translation>roku</translation>
+        <source>year(s)</source>
+        <translation>roku</translation>
     </message>
     <message>
-      <source>Every</source>
-      <translation>Každý</translation>
+        <source>Every</source>
+        <translation>Každý</translation>
     </message>
-  </context>
-  <context>
+</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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Description:</source>
-      <translation>Popis:</translation>
+        <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>Priority:</source>
-      <translation>Priorita:</translation>
+        <source>Deadline:</source>
+        <translation>Uzávěrka:</translation>
     </message>
     <message>
-      <source>Very high</source>
-      <translation>Velmi vysoká</translation>
+        <source>Category:</source>
+        <translation>Kategorie:</translation>
     </message>
     <message>
-      <source>High</source>
-      <translation>Vysoká</translation>
+        <source>Default Email: </source>
+        <translation>Výchozí Email:</translation>
     </message>
     <message>
-      <source>Normal</source>
-      <translation>Normální</translation>
+        <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>Low</source>
-      <translation>Nízká</translation>
+        <source>Office: </source>
+        <translation>Kancelář:</translation>
     </message>
     <message>
-      <source>Very low</source>
-      <translation>Velmi nízká</translation>
+        <source>Business Web Page: </source>
+        <translation>Webová stránka práce:</translation>
     </message>
     <message>
-      <source>Progress:</source>
-      <translation>Postup:</translation>
+        <source>Business Phone: </source>
+        <translation>Telefon do práce:</translation>
     </message>
     <message>
-      <source>Deadline:</source>
-      <translation>Uzávěrka:</translation>
+        <source>Business Fax: </source>
+        <translation>Fax do práce:</translation>
     </message>
     <message>
-      <source>Category:</source>
-      <translation>Kategorie:</translation>
+        <source>Business Mobile: </source>
+        <translation>Mobil do práce:</translation>
     </message>
     <message>
-      <source>Default Email: </source>
-      <translation>Výchozí Email:</translation>
+        <source>Business Pager: </source>
+        <translation>Pager do práce:</translation>
     </message>
     <message>
-      <source>&lt;br>&lt;b>Work Address:&lt;/b></source>
-      <translation>&lt;br>&lt;b>Adresa zaměstnání:&lt;/b></translation>
+        <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>Office: </source>
-      <translation>Kancelář:</translation>
+        <source>Home Web Page: </source>
+        <translation>Domácí webová stránka:</translation>
     </message>
     <message>
-      <source>Business Web Page: </source>
-      <translation>Webová stránka práce:</translation>
+        <source>Home Phone: </source>
+        <translation>Telefon domů:</translation>
     </message>
     <message>
-      <source>Business Phone: </source>
-      <translation>Telefon do práce:</translation>
+        <source>Home Fax: </source>
+        <translation>Fax domů:</translation>
     </message>
     <message>
-      <source>Business Fax: </source>
-      <translation>Fax do práce:</translation>
+        <source>Home Mobile: </source>
+        <translation>Soukromý mobil:</translation>
     </message>
     <message>
-      <source>Business Mobile: </source>
-      <translation>Mobil do práce:</translation>
+        <source>All Emails: </source>
+        <translation>Všechny Emaily:</translation>
     </message>
     <message>
-      <source>Business Pager: </source>
-      <translation>Pager do práce:</translation>
+        <source>Profession: </source>
+        <translation>Profese:</translation>
     </message>
     <message>
-      <source>&lt;br>&lt;b>Home Address:&lt;/b></source>
-      <translation>&lt;br>&lt;b>Adresa domů:&lt;/b></translation>
+        <source>Assistant: </source>
+        <translation>Asistent:</translation>
     </message>
     <message>
-      <source>Home Web Page: </source>
-      <translation>Domácí webová stránka:</translation>
+        <source>Manager: </source>
+        <translation>Vedoucí:</translation>
     </message>
     <message>
-      <source>Home Phone: </source>
-      <translation>Telefon domů:</translation>
+        <source>Male</source>
+        <translation>Muž</translation>
     </message>
     <message>
-      <source>Home Fax: </source>
-      <translation>Fax domů:</translation>
+        <source>Female</source>
+        <translation>Žena</translation>
     </message>
     <message>
-      <source>Home Mobile: </source>
-      <translation>Soukromý mobil:</translation>
+        <source>Gender: </source>
+        <translation>Pohlaví:</translation>
     </message>
     <message>
-      <source>All Emails: </source>
-      <translation>Všechny Emaily:</translation>
+        <source>Spouse: </source>
+        <translation>Manžel(ka):</translation>
     </message>
     <message>
-      <source>Profession: </source>
-      <translation>Profese:</translation>
+        <source>Birthday: </source>
+        <translation>Narozeniny:</translation>
     </message>
     <message>
-      <source>Assistant: </source>
-      <translation>Asistent:</translation>
+        <source>Anniversary: </source>
+        <translation>Výročí:</translation>
     </message>
     <message>
-      <source>Manager: </source>
-      <translation>Vedoucí:</translation>
+        <source>Children: </source>
+        <translation>Děti:</translation>
     </message>
     <message>
-      <source>Male</source>
-      <translation>Muž</translation>
+        <source>Nickname: </source>
+        <translation>Přezdívka:</translation>
     </message>
     <message>
-      <source>Female</source>
-      <translation>Žena</translation>
+        <source>Notes:</source>
+        <translation>Poznámky:</translation>
     </message>
     <message>
-      <source>Gender: </source>
-      <translation>Pohlaví:</translation>
+        <source>User Id</source>
+        <translation>Uživatelské jméno</translation>
     </message>
     <message>
-      <source>Spouse: </source>
-      <translation>Manžel(ka):</translation>
+        <source>Categories</source>
+        <translation>Kategorie</translation>
     </message>
     <message>
-      <source>Birthday: </source>
-      <translation>Narozeniny:</translation>
+        <source>Name Title</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Anniversary: </source>
-      <translation>Výročí:</translation>
+        <source>First Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Children: </source>
-      <translation>Děti:</translation>
+        <source>Middle Name</source>
+        <translation>Křestní jméno</translation>
     </message>
     <message>
-      <source>Nickname: </source>
-      <translation>Přezdívka:</translation>
+        <source>Last Name</source>
+        <translation>Příjmení</translation>
     </message>
     <message>
-      <source>Notes:</source>
-      <translation>Poznámky:</translation>
+        <source>Suffix</source>
+        <translation>titul</translation>
     </message>
     <message>
-      <source>User Id</source>
-      <translation>Uživatelské jméno</translation>
+        <source>File As</source>
+        <translation>Soubor jako</translation>
     </message>
     <message>
-      <source>Categories</source>
-      <translation>Kategorie</translation>
+        <source>Job Title</source>
+        <translation>Název práce</translation>
     </message>
     <message>
-      <source>Name Title</source>
-      <translation>Jméno</translation>
+        <source>Department</source>
+        <translation>Oddělení</translation>
     </message>
     <message>
-      <source>First Name</source>
-      <translation>Jméno</translation>
+        <source>Company</source>
+        <translation>Firma</translation>
     </message>
     <message>
-      <source>Middle Name</source>
-      <translation>Křestní jméno</translation>
+        <source>Business Phone</source>
+        <translation>Telefon do práce</translation>
     </message>
     <message>
-      <source>Last Name</source>
-      <translation>Příjmení</translation>
+        <source>Business Fax</source>
+        <translation>Fax do práce</translation>
     </message>
     <message>
-      <source>Suffix</source>
-      <translation>titul</translation>
+        <source>Business Mobile</source>
+        <translation>Mobil do práce</translation>
     </message>
     <message>
-      <source>File As</source>
-      <translation>Soubor jako</translation>
+        <source>Default Email</source>
+        <translation>Výchozí Email</translation>
     </message>
     <message>
-      <source>Job Title</source>
-      <translation>Název práce</translation>
+        <source>Emails</source>
+        <translation>Emaily</translation>
     </message>
     <message>
-      <source>Department</source>
-      <translation>Oddělení</translation>
+        <source>Home Phone</source>
+        <translation>Telefon domů</translation>
     </message>
     <message>
-      <source>Company</source>
-      <translation>Firma</translation>
+        <source>Home Fax</source>
+        <translation>Fax domů</translation>
     </message>
     <message>
-      <source>Business Phone</source>
-      <translation>Telefon do práce</translation>
+        <source>Home Mobile</source>
+        <translation>Soukromý mobil</translation>
     </message>
     <message>
-      <source>Business Fax</source>
-      <translation>Fax do práce</translation>
+        <source>Business Street</source>
+        <translation>Ulice do práce</translation>
     </message>
     <message>
-      <source>Business Mobile</source>
-      <translation>Mobil do práce</translation>
+        <source>Business City</source>
+        <translation>Město do práce</translation>
     </message>
     <message>
-      <source>Default Email</source>
-      <translation>Výchozí Email</translation>
+        <source>Business State</source>
+        <translation>Stát do práce</translation>
     </message>
     <message>
-      <source>Emails</source>
-      <translation>Emaily</translation>
+        <source>Business Zip</source>
+        <translation>PSČ do práce</translation>
     </message>
     <message>
-      <source>Home Phone</source>
-      <translation>Telefon domů</translation>
+        <source>Business Country</source>
+        <translation>Země do práce</translation>
     </message>
     <message>
-      <source>Home Fax</source>
-      <translation>Fax domů</translation>
+        <source>Business Pager</source>
+        <translation>Pager do práce</translation>
     </message>
     <message>
-      <source>Home Mobile</source>
-      <translation>Soukromý mobil</translation>
+        <source>Business WebPage</source>
+        <translation>Webová stránka práce</translation>
     </message>
     <message>
-      <source>Business Street</source>
-      <translation>Ulice do práce</translation>
+        <source>Office</source>
+        <translation>Kancelář</translation>
     </message>
     <message>
-      <source>Business City</source>
-      <translation>Město do práce</translation>
+        <source>Profession</source>
+        <translation>Profese</translation>
     </message>
     <message>
-      <source>Business State</source>
-      <translation>Stát do práce</translation>
+        <source>Assistant</source>
+        <translation>Asistent</translation>
     </message>
     <message>
-      <source>Business Zip</source>
-      <translation>PSČ do práce</translation>
+        <source>Manager</source>
+        <translation>Vedoucí</translation>
     </message>
     <message>
-      <source>Business Country</source>
-      <translation>Země do práce</translation>
+        <source>Home Street</source>
+        <translation>Ulice domů</translation>
     </message>
     <message>
-      <source>Business Pager</source>
-      <translation>Pager do práce</translation>
+        <source>Home City</source>
+        <translation>Město domů</translation>
     </message>
     <message>
-      <source>Business WebPage</source>
-      <translation>Webová stránka práce</translation>
+        <source>Home State</source>
+        <translation>Stát domů</translation>
     </message>
     <message>
-      <source>Office</source>
-      <translation>Kancelář</translation>
+        <source>Home Zip</source>
+        <translation>Domácí PSČ</translation>
     </message>
     <message>
-      <source>Profession</source>
-      <translation>Profese</translation>
+        <source>Home Country</source>
+        <translation>Domácí země</translation>
     </message>
     <message>
-      <source>Assistant</source>
-      <translation>Asistent</translation>
+        <source>Home Web Page</source>
+        <translation>Domácí webová stránka</translation>
     </message>
     <message>
-      <source>Manager</source>
-      <translation>Vedoucí</translation>
+        <source>Spouse</source>
+        <translation>Manžel(ka)</translation>
     </message>
     <message>
-      <source>Home Street</source>
-      <translation>Ulice domů</translation>
+        <source>Gender</source>
+        <translation>Pohlaví</translation>
     </message>
     <message>
-      <source>Home City</source>
-      <translation>Město domů</translation>
+        <source>Birthday</source>
+        <translation>Narozeniny</translation>
     </message>
     <message>
-      <source>Home State</source>
-      <translation>Stát domů</translation>
+        <source>Anniversary</source>
+        <translation>Výročí</translation>
     </message>
     <message>
-      <source>Home Zip</source>
-      <translation>Domácí PSČ</translation>
+        <source>Nickname</source>
+        <translation>Přezdívka</translation>
     </message>
     <message>
-      <source>Home Country</source>
-      <translation>Domácí země</translation>
+        <source>Children</source>
+        <translation>Děti</translation>
     </message>
     <message>
-      <source>Home Web Page</source>
-      <translation>Domácí webová stránka</translation>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
     </message>
     <message>
-      <source>Spouse</source>
-      <translation>Manžel(ka)</translation>
+        <source>Location:</source>
+        <translation>Lokalita:</translation>
     </message>
     <message>
-      <source>Gender</source>
-      <translation>Pohlaví</translation>
+        <source>This is an all day event</source>
+        <translation>Toto je každodenní událost</translation>
     </message>
     <message>
-      <source>Birthday</source>
-      <translation>Narozeniny</translation>
+        <source>This is a multiple day event</source>
+        <translation>Toto je vícedenní událost</translation>
     </message>
     <message>
-      <source>Anniversary</source>
-      <translation>Výročí</translation>
+        <source>Start:</source>
+        <translation>Začátek:</translation>
     </message>
     <message>
-      <source>Nickname</source>
-      <translation>Přezdívka</translation>
+        <source>End:</source>
+        <translation>Konec:</translation>
     </message>
     <message>
-      <source>Children</source>
-      <translation>Děti</translation>
+        <source>Note:</source>
+        <translation>Poznámka:</translation>
     </message>
     <message>
-      <source>Notes</source>
-      <translation>Poznámky</translation>
+        <source>Every</source>
+        <translation>Každý</translation>
     </message>
     <message>
-      <source>Location:</source>
-      <translation>Lokalita:</translation>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 každý</translation>
     </message>
     <message>
-      <source>This is an all day event</source>
-      <translation>Toto je každodenní událost</translation>
+        <source>The %1 every </source>
+        <translation>%1 každý</translation>
     </message>
     <message>
-      <source>This is a multiple day event</source>
-      <translation>Toto je vícedenní událost</translation>
+        <source>The %1 %2 of every</source>
+        <translation>%1 %2 každého</translation>
     </message>
     <message>
-      <source>Start:</source>
-      <translation>Začátek:</translation>
+        <source>Every </source>
+        <translation>Každý</translation>
     </message>
     <message>
-      <source>End:</source>
-      <translation>Konec:</translation>
+        <source>Monday</source>
+        <translation>Pondělí</translation>
     </message>
     <message>
-      <source>Note:</source>
-      <translation>Poznámka:</translation>
+        <source>Tuesday</source>
+        <translation>Úterý</translation>
     </message>
     <message>
-      <source>Every</source>
-      <translation>Každý</translation>
+        <source>Wednesday</source>
+        <translation>Středa</translation>
     </message>
     <message>
-      <source>%1 %2 every </source>
-      <translation>%1 %2 každý</translation>
+        <source>Thursday</source>
+        <translation>Čtvrtek</translation>
     </message>
     <message>
-      <source>The %1 every </source>
-      <translation>%1 každý</translation>
+        <source>Friday</source>
+        <translation>Pátek</translation>
     </message>
     <message>
-      <source>The %1 %2 of every</source>
-      <translation>%1 %2 každého</translation>
+        <source>Saturday</source>
+        <translation>Sobota</translation>
     </message>
     <message>
-      <source>Every </source>
-      <translation>Každý</translation>
+        <source>Sunday</source>
+        <translation>Neděle</translation>
     </message>
     <message>
-      <source>Monday</source>
-      <translation>Pondělí</translation>
+        <source>Has a due-date</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Tuesday</source>
-      <translation>Úterý</translation>
+        <source>No due-date</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Wednesday</source>
-      <translation>Středa</translation>
+        <source>Completed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Thursday</source>
-      <translation>Čtvrtek</translation>
+        <source>Not completed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Friday</source>
-      <translation>Pátek</translation>
+        <source>No reccurrence</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Saturday</source>
-      <translation>Sobota</translation>
+        <source>No start-date</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Sunday</source>
-      <translation>Neděle</translation>
+        <source>No completed-date</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QWidget</name>
     <message>
-      <source>st</source>
-      <translation>.</translation>
+        <source>st</source>
+        <translation>.</translation>
     </message>
     <message>
-      <source>nd</source>
-      <translation>.</translation>
+        <source>nd</source>
+        <translation>.</translation>
     </message>
     <message>
-      <source>rd</source>
-      <translation>.</translation>
+        <source>rd</source>
+        <translation>.</translation>
     </message>
     <message>
-      <source>th</source>
-      <translation>.</translation>
+        <source>th</source>
+        <translation>.</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libopiesecurity2.ts b/i18n/cz/libopiesecurity2.ts
index 9503d7e..d8fa484 100644
--- a/i18n/cz/libopiesecurity2.ts
+++ b/i18n/cz/libopiesecurity2.ts
@@ -1,41 +1,56 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-      <source>Welcome to Opie Multi-authentication Framework</source>
-      <translation>Vítejte v systému Multi-autentizace Opie</translation>
+        <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>
+        <source>Launching authentication plugins...</source>
+        <translation>Spouštím autentizační pluginy...</translation>
     </message>
     <message>
-      <source>Proceed...</source>
-      <translation>Pokračovat...</translation>
+        <source>Proceed...</source>
+        <translation>Pokračovat...</translation>
     </message>
     <message>
-      <source>Note: the 'exit' button should be removed for real protection, through Security config dialog</source>
-      <translation>Poznámka: pro opravdovou ochranu by mělo být tlačítko 'exit' odstraněno v okně bezpečnostního nastavení</translation>
+        <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>
+        <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>Nemáte dostatek úspěšných autentizačních kroků!</translation>
+        <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 'allow to bypass' was uncheck in Security config, you would have to go back through all the steps now.</source>
-      <translation>Poznámka: Jestliže nemáte zaškrtnutý  'Povolit obejití' v konfiguraci bezpečnosti, měli byste jít zpět skrz všechny kroky.</translation>
+        <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>
-  </context>
-  <context>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
+        <translation type="unfinished"></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 type="unfinished"></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>
+        <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>
+</context>
 </TS>
diff --git a/i18n/cz/libopietooth2.ts b/i18n/cz/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/cz/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libopietooth2applet.ts b/i18n/cz/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/cz/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libopieui2.ts b/i18n/cz/libopieui2.ts
index cf66a0f..232bd9f 100644
--- a/i18n/cz/libopieui2.ts
+++ b/i18n/cz/libopieui2.ts
@@ -1,176 +1,209 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>OFileDialog</name>
     <message>
-      <source>FileDialog</source>
-      <translation>Okno souboru</translation>
+        <source>FileDialog</source>
+        <translation type="obsolete">Okno souboru</translation>
     </message>
     <message>
-      <source>Open</source>
-      <translation>Otevřít</translation>
+        <source>Open</source>
+        <translation type="obsolete">Otevřít</translation>
     </message>
     <message>
-      <source>Save</source>
-      <translation>Uložit</translation>
+        <source>Save</source>
+        <translation type="obsolete">Uložit</translation>
     </message>
     <message>
-      <source>Select Directory</source>
-      <translation>Vyberte adresář</translation>
+        <source>Select Directory</source>
+        <translation type="obsolete">Vyberte adresář</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>OFontSelector</name>
     <message>
-      <source>Style</source>
-      <translation>Styl</translation>
+        <source>Style</source>
+        <translation type="obsolete">Styl</translation>
     </message>
     <message>
-      <source>Size</source>
-      <translation>Velikost</translation>
+        <source>Size</source>
+        <translation type="obsolete">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>
+        <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>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
-      <source>OTimePickerDialogBase</source>
-      <translation>Dialog výběru času</translation>
+        <source>OTimePickerDialogBase</source>
+        <translation>Dialog výběru času</translation>
     </message>
     <message>
-      <source>Time:</source>
-      <translation>Čas:</translation>
+        <source>Time:</source>
+        <translation>Čas:</translation>
     </message>
     <message>
-      <source>:</source>
-      <translation>:</translation>
+        <source>:</source>
+        <translation>:</translation>
     </message>
     <message>
-      <source>Pick Time:</source>
-      <translation>Čas podání:</translation>
+        <source>Pick Time:</source>
+        <translation>Čas podání:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Size</source>
-      <translation>Velikost</translation>
+        <source>Size</source>
+        <translation>Velikost</translation>
     </message>
     <message>
-      <source>Date</source>
-      <translation>Datum</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-      <source>Mime Type</source>
-      <translation>MIME typ</translation>
+        <source>Mime Type</source>
+        <translation>MIME typ</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="unfinished">Okno souboru</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished">Otevřít</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Uložit</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished">Vyberte adresář</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
-      <source>Name:</source>
-      <translation>Jméno:</translation>
+        <source>Name:</source>
+        <translation>Jméno:</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">Velikost</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="unfinished">Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
-      <source>Configure Key</source>
-      <translation>Konfigurovat klávesy</translation>
+        <source>Configure Key</source>
+        <translation>Konfigurovat klávesy</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
-      <source>Pixmap</source>
-      <translation>Pixmapa</translation>
+        <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>
+        <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>
+        <source>Key</source>
+        <translation>Klávesa</translation>
     </message>
     <message>
-      <source>Default Key</source>
-      <translation>Výchozí klávesa</translation>
+        <source>Default Key</source>
+        <translation>Výchozí klávesa</translation>
     </message>
     <message>
-      <source>Shortcut for Selected Action</source>
-      <translation>Zkratka pro vybranou akci</translation>
+        <source>Shortcut for Selected Action</source>
+        <translation>Zkratka pro vybranou akci</translation>
     </message>
     <message>
-      <source>&amp;None</source>
-      <translation>Žád&amp;ná</translation>
+        <source>&amp;None</source>
+        <translation>Žád&amp;ná</translation>
     </message>
     <message>
-      <source>&amp;Default</source>
-      <translation>&amp;Výchozí</translation>
+        <source>&amp;Default</source>
+        <translation>&amp;Výchozí</translation>
     </message>
     <message>
-      <source>C&amp;ustom</source>
-      <translation>V&amp;lastní</translation>
+        <source>C&amp;ustom</source>
+        <translation>V&amp;lastní</translation>
     </message>
     <message>
-      <source>Configure Key</source>
-      <translation>Konfigurace kláves</translation>
+        <source>Configure Key</source>
+        <translation>Konfigurace kláves</translation>
     </message>
     <message>
-      <source>Default: </source>
-      <translation>Výchozí: </translation>
+        <source>Default: </source>
+        <translation>Výchozí: </translation>
     </message>
     <message>
-      <source>Key is on BlackList</source>
-      <translation>Klávesa je na černé listině</translation>
+        <source>Key is on BlackList</source>
+        <translation>Klávesa je na černé listině</translation>
     </message>
     <message>
-      <source>&lt;qt>The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt></source>
-      <translation>&lt;qt>Vybraná klávesa je na černé listině a nelze ji vybrat tímto správcem. Prosím použijte jinou klávesu.&lt;/qt></translation>
+        <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>
+        <source>Key is already assigned</source>
+        <translation>Tato klávesa byla již přiřazena</translation>
     </message>
     <message>
-      <source>&lt;qt>The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt></source>
-      <translation>&lt;qt>Klávesa, kterou jste vybrali již byla přiřazena jiné položce vaší konfigurace. Prosím zkuste jinou klávesu.&lt;/qt></translation>
+        <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>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Documents</source>
-      <translation>Dokumenty</translation>
+        <source>Documents</source>
+        <translation>Dokumenty</translation>
     </message>
     <message>
-      <source>Files</source>
-      <translation>Soubory</translation>
+        <source>Files</source>
+        <translation>Soubory</translation>
     </message>
     <message>
-      <source>All Files</source>
-      <translation>Všechny soubory</translation>
+        <source>All Files</source>
+        <translation>Všechny soubory</translation>
     </message>
     <message>
-      <source>None</source>
-      <translation>Žádný</translation>
+        <source>None</source>
+        <translation>Žádný</translation>
     </message>
     <message>
-      <source>Directories</source>
-      <translation>Adresáře</translation>
+        <source>Directories</source>
+        <translation>Adresáře</translation>
     </message>
     <message>
-      <source>All Directories</source>
-      <translation>Všechny adresáře</translation>
+        <source>All Directories</source>
+        <translation>Všechny adresáře</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libphasestyle.ts b/i18n/cz/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/cz/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libppp.ts b/i18n/cz/libppp.ts
index 48903ab..99c267a 100644
--- a/i18n/cz/libppp.ts
+++ b/i18n/cz/libppp.ts
@@ -1,219 +1,315 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>PPPAuthEdit</name>
     <message>
-      <source>Login send missing</source>
-      <translation>Posílaný Login chybí</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Pap/Chap/EAP secret id missing</source>
+        <translation>Pap/Chap/EAP secret id chybí</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PPPAuthGUI</name>
     <message>
-      <source>PPPAuth</source>
-      <translation>PPPAuth</translation>
+        <source>PPPAuth</source>
+        <translation>PPPAuth</translation>
     </message>
     <message>
-      <source>Login</source>
-      <translation>Login</translation>
+        <source>Login</source>
+        <translation>Login</translation>
     </message>
     <message>
-      <source>ogin:</source>
-      <translation>ogin:</translation>
+        <source>ogin:</source>
+        <translation>ogin:</translation>
     </message>
     <message>
-      <source>assword:</source>
-      <translation>assword:</translation>
+        <source>assword:</source>
+        <translation>assword:</translation>
     </message>
     <message>
-      <source>Pap</source>
-      <translation>Pap</translation>
+        <source>Pap</source>
+        <translation>Pap</translation>
     </message>
     <message>
-      <source>Chap</source>
-      <translation>Chap</translation>
+        <source>Chap</source>
+        <translation>Chap</translation>
     </message>
     <message>
-      <source>EAP</source>
-      <translation>EAP</translation>
+        <source>EAP</source>
+        <translation>EAP</translation>
     </message>
     <message>
-      <source>Server</source>
-      <translation>Server</translation>
+        <source>Server</source>
+        <translation>Server</translation>
     </message>
     <message>
-      <source>Secret</source>
-      <translation>Secret</translation>
+        <source>Secret</source>
+        <translation>Secret</translation>
     </message>
     <message>
-      <source>*</source>
-      <translation>*</translation>
+        <source>*</source>
+        <translation>*</translation>
     </message>
     <message>
-      <source>Client</source>
-      <translation>Klient</translation>
+        <source>Client</source>
+        <translation>Klient</translation>
     </message>
     <message>
-      <source>Terminal</source>
-      <translation>Terminál</translation>
+        <source>Terminal</source>
+        <translation>Terminál</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PPPDNSEdit</name>
     <message>
-      <source>Domainname needed</source>
-      <translation>Jméno domény je vyžadováno</translation>
+        <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>
+        <source>DNS Servers needed</source>
+        <translation>DNS servery jsou vyžadovány</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PPPDNSGUI</name>
     <message>
-      <source>PPPDNS</source>
-      <translation>PPPDNS</translation>
+        <source>PPPDNS</source>
+        <translation>PPPDNS</translation>
     </message>
     <message>
-      <source>Server assigned</source>
-      <translation>Přiděluje server</translation>
+        <source>Server assigned</source>
+        <translation>Přiděluje server</translation>
     </message>
     <message>
-      <source>Fixed</source>
-      <translation>Pevný</translation>
+        <source>Fixed</source>
+        <translation>Pevný</translation>
     </message>
     <message>
-      <source>DomainName</source>
-      <translation>Jméno domény</translation>
+        <source>DomainName</source>
+        <translation>Jméno domény</translation>
     </message>
     <message>
-      <source>Address</source>
-      <translation>Adresa</translation>
+        <source>Address</source>
+        <translation>Adresa</translation>
     </message>
     <message>
-      <source>...</source>
-      <translation>...</translation>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-      <source>List</source>
-      <translation>Seznam</translation>
+        <source>List</source>
+        <translation>Seznam</translation>
     </message>
-  </context>
-  <context>
+</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>
+        <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>Authentication</source>
-      <translation>Autentizace</translation>
+        <source>DNS Settings</source>
+        <translation>Nastavení DNS</translation>
     </message>
     <message>
-      <source>IP settings</source>
-      <translation>Nastavení IP</translation>
+        <source>Commands</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>DNS Settings</source>
-      <translation>Nastavení DNS</translation>
+        <source>Dialing</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PPPIPEdit</name>
     <message>
-      <source>IPAddress needed</source>
-      <translation>IP adresa je vyžadována</translation>
+        <source>IPAddress needed</source>
+        <translation type="obsolete">IP adresa je vyžadována</translation>
     </message>
     <message>
-      <source>IPAddress not valid</source>
-      <translation>IP adresa je neplatná</translation>
+        <source>IPAddress not valid</source>
+        <translation type="obsolete">IP adresa je neplatná</translation>
     </message>
     <message>
-      <source>Subnet mask needed</source>
-      <translation>Síťová maska je vyžadována</translation>
+        <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>Síťová maska je neplatná</translation>
+        <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>
+        <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>
+        <source>Gateway address not valid</source>
+        <translation>Adresa brány je neplatná</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PPPIPGUI</name>
     <message>
-      <source>PPPIP</source>
-      <translation>PPPIP</translation>
+        <source>PPPIP</source>
+        <translation>PPPIP</translation>
     </message>
     <message>
-      <source>IP</source>
-      <translation>IP</translation>
+        <source>IP</source>
+        <translation>IP</translation>
     </message>
     <message>
-      <source>Server assigned</source>
-      <translation>Přiděluje server</translation>
+        <source>Server assigned</source>
+        <translation>Přiděluje server</translation>
     </message>
     <message>
-      <source>Fixed</source>
-      <translation>Pevná</translation>
+        <source>Fixed</source>
+        <translation>Pevná</translation>
     </message>
     <message>
-      <source>Subnetmask</source>
-      <translation>Síťová maska</translation>
+        <source>Subnetmask</source>
+        <translation type="obsolete">Síťová maska</translation>
     </message>
     <message>
-      <source>Address</source>
-      <translation>Adresa</translation>
+        <source>Address</source>
+        <translation>Adresa</translation>
     </message>
     <message>
-      <source>Gateway</source>
-      <translation>Brána</translation>
+        <source>Gateway</source>
+        <translation>Brána</translation>
     </message>
     <message>
-      <source>Set as default</source>
-      <translation>Nastavit jako výchozí</translation>
+        <source>Set as default</source>
+        <translation>Nastavit jako výchozí</translation>
     </message>
-  </context>
-  <context>
+    <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>PPP připojení</translation>
+        <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 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;p>Sets up IP using PPP.&lt;/p>&lt;p>Use this for dialup devices or serial setups&lt;/p></source>
-      <translation>&lt;p>Nastaví IP s použitím PPP.&lt;/p>&lt;p>Použijte pro vytáčené, nebo sériové připojení&lt;/p></translation>
+        <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>
+</context>
 </TS>
diff --git a/i18n/cz/libprofile.ts b/i18n/cz/libprofile.ts
index 4176a1d..4ba4db9 100644
--- a/i18n/cz/libprofile.ts
+++ b/i18n/cz/libprofile.ts
@@ -1,141 +1,164 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>ProfileGUI</name>
     <message>
-      <source>Profile</source>
-      <translation>Profil</translation>
+        <source>Profile</source>
+        <translation>Profil</translation>
     </message>
     <message>
-      <source>Setup</source>
-      <translation>Nastavení</translation>
+        <source>Setup</source>
+        <translation>Nastavení</translation>
     </message>
     <message>
-      <source>Start</source>
-      <translation>Start</translation>
+        <source>Start</source>
+        <translation>Start</translation>
     </message>
     <message>
-      <source>Automatically</source>
-      <translation>Automaticky</translation>
+        <source>Automatically</source>
+        <translation>Automaticky</translation>
     </message>
     <message>
-      <source>Ask</source>
-      <translation>Na dotaz</translation>
+        <source>Ask</source>
+        <translation>Na dotaz</translation>
     </message>
     <message>
-      <source>Disabled</source>
-      <translation>Vypnuto</translation>
+        <source>Disabled</source>
+        <translation type="obsolete">Vypnuto</translation>
     </message>
     <message>
-      <source>Trigger VPN</source>
-      <translation>Spustit VPN</translation>
+        <source>Trigger VPN</source>
+        <translation>Spustit VPN</translation>
     </message>
     <message>
-      <source>Description</source>
-      <translation>Popis</translation>
+        <source>Description</source>
+        <translation>Popis</translation>
     </message>
     <message>
-      <source>State</source>
-      <translation>Stav</translation>
+        <source>State</source>
+        <translation>Stav</translation>
     </message>
     <message>
-      <source>eth0</source>
-      <translation>eth0</translation>
+        <source>eth0</source>
+        <translation>eth0</translation>
     </message>
     <message>
-      <source>(Multicast, Up)</source>
-      <translation>(Multicast, Up)</translation>
+        <source>(Multicast, Up)</source>
+        <translation>(Multicast, Up)</translation>
     </message>
     <message>
-      <source>Subnet Mask</source>
-      <translation>Síťová maska</translation>
+        <source>Subnet Mask</source>
+        <translation>Síťová maska</translation>
     </message>
     <message>
-      <source>Broadcast</source>
-      <translation>Broadcast</translation>
+        <source>Broadcast</source>
+        <translation>Broadcast</translation>
     </message>
     <message>
-      <source>MAC</source>
-      <translation>MAC</translation>
+        <source>MAC</source>
+        <translation>MAC</translation>
     </message>
     <message>
-      <source>P-t-P</source>
-      <translation>P-t-P</translation>
+        <source>P-t-P</source>
+        <translation>P-t-P</translation>
     </message>
     <message>
-      <source>IP Address</source>
-      <translation>IP adresa</translation>
+        <source>IP Address</source>
+        <translation>IP adresa</translation>
     </message>
     <message>
-      <source>0.0.0.0</source>
-      <translation>0.0.0.0</translation>
+        <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>
+        <source>00:00:00:00:00:00</source>
+        <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
-      <source>DHCP</source>
-      <translation>DHCP</translation>
+        <source>DHCP</source>
+        <translation>DHCP</translation>
     </message>
     <message>
-      <source>Lease Expires</source>
-      <translation>Pronájem vyprší</translation>
+        <source>Lease Expires</source>
+        <translation>Pronájem vyprší</translation>
     </message>
     <message>
-      <source>Lease Obtained</source>
-      <translation>Pronájem získán</translation>
+        <source>Lease Obtained</source>
+        <translation>Pronájem získán</translation>
     </message>
     <message>
-      <source>DHCP Server</source>
-      <translation>DHCP Server</translation>
+        <source>DHCP Server</source>
+        <translation>DHCP Server</translation>
     </message>
     <message>
-      <source>Traffic</source>
-      <translation>Provoz</translation>
+        <source>Traffic</source>
+        <translation>Provoz</translation>
     </message>
     <message>
-      <source>Receiving</source>
-      <translation>Příjem</translation>
+        <source>Receiving</source>
+        <translation>Příjem</translation>
     </message>
     <message>
-      <source>Errors</source>
-      <translation>Chyby</translation>
+        <source>Errors</source>
+        <translation>Chyby</translation>
     </message>
     <message>
-      <source>Dropped</source>
-      <translation>Zahozeno</translation>
+        <source>Dropped</source>
+        <translation>Zahozeno</translation>
     </message>
     <message>
-      <source>Bytes</source>
-      <translation>Bajtů</translation>
+        <source>Bytes</source>
+        <translation>Bajtů</translation>
     </message>
     <message>
-      <source>Transmitting</source>
-      <translation>Odesílání</translation>
+        <source>Transmitting</source>
+        <translation type="obsolete">Odesílání</translation>
     </message>
     <message>
-      <source>Others</source>
-      <translation>Ostatní</translation>
+        <source>Others</source>
+        <translation type="obsolete">Ostatní</translation>
     </message>
     <message>
-      <source>Collisions</source>
-      <translation>Kolize</translation>
+        <source>Collisions</source>
+        <translation>Kolize</translation>
     </message>
     <message>
-      <source>Live feed </source>
-      <translation>Živý posun</translation>
+        <source>Live feed </source>
+        <translation>Živý posun</translation>
     </message>
-  </context>
-  <context>
+    <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>Standardní profil připojení</translation>
+        <source>Regular connection profile</source>
+        <translation>Standardní profil připojení</translation>
     </message>
     <message>
-      <source>&lt;p>Define use of an IP connection.&lt;/p>&lt;p>Configure if and when this connection needs to be established&lt;/p></source>
-      <translation>&lt;p>Definuje použití IP připojení.&lt;/p>&lt;p>Nastavte jestliže budete potřebovat navázat spojení&lt;/p></translation>
+        <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>
+</context>
 </TS>
diff --git a/i18n/cz/libqpe.ts b/i18n/cz/libqpe.ts
index bfe7eae..e4fa7b6 100644
--- a/i18n/cz/libqpe.ts
+++ b/i18n/cz/libqpe.ts
@@ -1,521 +1,520 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>Categories</name>
     <message>
-      <source>All</source>
-      <translation>Všechno</translation>
+        <source>All</source>
+        <translation>Všechno</translation>
     </message>
     <message>
-      <source>Unfiled</source>
-      <translation>Nezařazeno</translation>
+        <source>Unfiled</source>
+        <translation>Nezařazeno</translation>
     </message>
     <message>
-      <source> (multi.)</source>
-      <translation>(více.)</translation>
+        <source> (multi.)</source>
+        <translation>(více.)</translation>
     </message>
     <message>
-      <source>Business</source>
-      <translation>Pracovní</translation>
+        <source>Business</source>
+        <translation>Pracovní</translation>
     </message>
     <message>
-      <source>Personal</source>
-      <translation>Osobní</translation>
+        <source>Personal</source>
+        <translation>Osobní</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CategoryCombo</name>
     <message>
-      <source> (Multi.)</source>
-      <translation>(Více.)</translation>
+        <source> (Multi.)</source>
+        <translation>(Více.)</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CategoryEdit</name>
     <message>
-      <source>All</source>
-      <translation>Všechno</translation>
+        <source>All</source>
+        <translation>Všechno</translation>
     </message>
     <message>
-      <source>New Category</source>
-      <translation>Nová kategorie</translation>
+        <source>New Category</source>
+        <translation>Nová kategorie</translation>
     </message>
     <message>
-      <source>New Category </source>
-      <translation>Nová kategorie</translation>
+        <source>New Category </source>
+        <translation>Nová kategorie</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CategoryEditBase</name>
     <message>
-      <source>Category Edit</source>
-      <translation>Úprava kategorie</translation>
+        <source>Category Edit</source>
+        <translation>Úprava kategorie</translation>
     </message>
     <message>
-      <source>Categories</source>
-      <translation>Kategorie</translation>
+        <source>Categories</source>
+        <translation>Kategorie</translation>
     </message>
     <message>
-      <source>Application</source>
-      <translation>Aplikace</translation>
+        <source>Application</source>
+        <translation>Aplikace</translation>
     </message>
     <message>
-      <source>Categories Go Here</source>
-      <translation>Kategorie jdou sem</translation>
+        <source>Categories Go Here</source>
+        <translation>Kategorie jdou sem</translation>
     </message>
     <message>
-      <source>Check the categories this document belongs to.</source>
-      <translation>Zaškrtněte kategorie, do kterých tento dokument patří.</translation>
+        <source>Check the categories this document belongs to.</source>
+        <translation>Zaškrtněte kategorie, do kterých tento dokument patří.</translation>
     </message>
     <message>
-      <source>Enter a new category here.  Press &lt;b>Add&lt;/b> to add it to the list.</source>
-      <translation>Sem zadejte novou kategorii. Pro přidání do seznamu stiskněte &lt;b>Přidat&lt;/b>.</translation>
+        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
+        <translation>Sem zadejte novou kategorii. Pro přidání do seznamu stiskněte &lt;b&gt;Přidat&lt;/b&gt;.</translation>
     </message>
     <message>
-      <source>Add</source>
-      <translation>Přidat</translation>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
-      <source>Enter a new category to the left and press to add it to the list.</source>
-      <translation>Doleva zadejte novou kategorii a stiskněte pro její přidání.</translation>
+        <source>Enter a new category to the left and press to add it to the list.</source>
+        <translation>Doleva zadejte novou kategorii a stiskněte pro její přidání.</translation>
     </message>
     <message>
-      <source>Press to delete the highlighted category.</source>
-      <translation>Stiskněte pro smazání označené kategorie.</translation>
+        <source>Press to delete the highlighted category.</source>
+        <translation>Stiskněte pro smazání označené kategorie.</translation>
     </message>
     <message>
-      <source>Global</source>
-      <translation>Globální</translation>
+        <source>Global</source>
+        <translation>Globální</translation>
     </message>
     <message>
-      <source>Check to make this property available to all applications.</source>
-      <translation>Zaškrtněte pro poskytnutí této vlastnosti všem aplikacím.</translation>
+        <source>Check to make this property available to all applications.</source>
+        <translation>Zaškrtněte pro poskytnutí této vlastnosti všem aplikacím.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CategoryMenu</name>
     <message>
-      <source>All</source>
-      <translation>Všechny</translation>
+        <source>All</source>
+        <translation>Všechny</translation>
     </message>
     <message>
-      <source>Unfiled</source>
-      <translation>Nezařazené</translation>
+        <source>Unfiled</source>
+        <translation>Nezařazené</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>CategorySelect</name>
     <message>
-      <source>Error</source>
-      <translation>Chyba</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>Sorry, another application is
+        <source>Sorry, another application is
 editing categories.</source>
-      <translation>Omlouváme se, ale jiná aplikace
+        <translation>Omlouváme se, ale jiná aplikace
 právě upravuje kategorie.</translation>
     </message>
     <message>
-      <source>Edit Categories</source>
-      <translation>Upravit kategorie</translation>
+        <source>Edit Categories</source>
+        <translation>Upravit kategorie</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Všechny</translation>
+        <source>All</source>
+        <translation>Všechny</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>DateBookMonthHeader</name>
     <message>
-      <source>Show January in the selected year</source>
-      <translation>Zobrazit Leden v označeném roce</translation>
+        <source>Show January in the selected year</source>
+        <translation>Zobrazit Leden v označeném roce</translation>
     </message>
     <message>
-      <source>Show the previous month</source>
-      <translation>Zobrazit předchozí měsíc</translation>
+        <source>Show the previous month</source>
+        <translation>Zobrazit předchozí měsíc</translation>
     </message>
     <message>
-      <source>Show the next month</source>
-      <translation>Zobrazit následující měsíc</translation>
+        <source>Show the next month</source>
+        <translation>Zobrazit následující měsíc</translation>
     </message>
     <message>
-      <source>Show December in the selected year</source>
-      <translation>Zobrazit Prosinec v označeném roce</translation>
+        <source>Show December in the selected year</source>
+        <translation>Zobrazit Prosinec v označeném roce</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FileSelector</name>
     <message>
-      <source>Close the File Selector</source>
-      <translation>Zavřít dialog pro vybrání souboru</translation>
+        <source>Close the File Selector</source>
+        <translation>Zavřít dialog pro vybrání souboru</translation>
     </message>
     <message>
-      <source>Show documents of this type</source>
-      <translation>Zobrazit dokumenty tohoto typu</translation>
+        <source>Show documents of this type</source>
+        <translation>Zobrazit dokumenty tohoto typu</translation>
     </message>
     <message>
-      <source>Document View</source>
-      <translation>Dokumenty</translation>
+        <source>Document View</source>
+        <translation>Dokumenty</translation>
     </message>
     <message>
-      <source>Show documents in this category</source>
-      <translation>Zobrazit dokumenty v této kategorii</translation>
+        <source>Show documents in this category</source>
+        <translation>Zobrazit dokumenty v této kategorii</translation>
     </message>
     <message>
-      <source>Click to select a document from the list</source>
-      <translation>Klikněte pro výběr dokumentu ze seznamu</translation>
+        <source>Click to select a document from the list</source>
+        <translation>Klikněte pro výběr dokumentu ze seznamu</translation>
     </message>
     <message>
-      <source>, or select &lt;b>New Document&lt;/b> to create a new document.</source>
-      <translation>, nebo vyberte &lt;b>Nový Dokument&lt;/b> pro vytvoření nového.</translation>
+        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
+        <translation>, nebo vyberte &lt;b&gt;Nový Dokument&lt;/b&gt; pro vytvoření nového.</translation>
     </message>
     <message>
-      <source>&lt;br>&lt;br>Click and hold for document properties.</source>
-      <translation>&lt;br>&lt;br>Pro vlastnosti dokumentu stiskněte a podržte.</translation>
+        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
+        <translation>&lt;br&gt;&lt;br&gt;Pro vlastnosti dokumentu stiskněte a podržte.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FileSelectorView</name>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FindDialog</name>
     <message>
-      <source>Find</source>
-      <translation>Hledat</translation>
+        <source>Find</source>
+        <translation>Hledat</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FindWidget</name>
     <message>
-      <source>String Not Found.</source>
-      <translation>Řetězec nenalezen.</translation>
+        <source>String Not Found.</source>
+        <translation>Řetězec nenalezen.</translation>
     </message>
     <message>
-      <source>End reached, starting at %1</source>
-      <comment>Date using TimeString::shortDate</comment>
-      <translation>Dosažen konec, začínám na %1</translation>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation>Dosažen konec, začínám na %1</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FindWidgetBase</name>
     <message>
-      <source>Find</source>
-      <translation>Hledat</translation>
+        <source>Find</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Find what:</source>
-      <translation>Co hledat:</translation>
+        <source>Find what:</source>
+        <translation>Co hledat:</translation>
     </message>
     <message>
-      <source>Category:</source>
-      <translation>Kategorie:</translation>
+        <source>Category:</source>
+        <translation>Kategorie:</translation>
     </message>
     <message>
-      <source>Start Search at:</source>
-      <translation>Kde spustit hledání:</translation>
+        <source>Start Search at:</source>
+        <translation>Kde spustit hledání:</translation>
     </message>
     <message>
-      <source>Dec 02 01</source>
-      <translation>Pros 02 01</translation>
+        <source>Dec 02 01</source>
+        <translation>Pros 02 01</translation>
     </message>
     <message>
-      <source>Case Sensitive</source>
-      <translation>Rozlišovat velikost</translation>
+        <source>Case Sensitive</source>
+        <translation>Rozlišovat velikost</translation>
     </message>
     <message>
-      <source>Search Backwards</source>
-      <translation>Hledat odzadu</translation>
+        <source>Search Backwards</source>
+        <translation>Hledat odzadu</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LnkProperties</name>
     <message>
-      <source>Properties</source>
-      <translation>Vlastnosti</translation>
+        <source>Properties</source>
+        <translation>Vlastnosti</translation>
     </message>
     <message>
-      <source>Document View</source>
-      <translation>Dokumenty</translation>
+        <source>Document View</source>
+        <translation>Dokumenty</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>File deletion failed.</source>
-      <translation>Smazání souboru selhalo.</translation>
+        <source>File deletion failed.</source>
+        <translation>Smazání souboru selhalo.</translation>
     </message>
     <message>
-      <source>Hard Disk</source>
-      <translation>Hard Disk</translation>
+        <source>Hard Disk</source>
+        <translation>Hard Disk</translation>
     </message>
     <message>
-      <source>Copy of </source>
-      <translation>Kopie</translation>
+        <source>Copy of </source>
+        <translation>Kopie</translation>
     </message>
     <message>
-      <source>Duplicate</source>
-      <translation>Duplikát</translation>
+        <source>Duplicate</source>
+        <translation>Duplikát</translation>
     </message>
     <message>
-      <source>File copy failed.</source>
-      <translation>Kopírování selhalo.</translation>
+        <source>File copy failed.</source>
+        <translation>Kopírování selhalo.</translation>
     </message>
     <message>
-      <source>Details</source>
-      <translation>Detaily</translation>
+        <source>Details</source>
+        <translation>Detaily</translation>
     </message>
     <message>
-      <source>Moving Document failed.</source>
-      <translation>Přesunutí dokumentu selhalo.</translation>
+        <source>Moving Document failed.</source>
+        <translation>Přesunutí dokumentu selhalo.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LnkPropertiesBase</name>
     <message>
-      <source>Details</source>
-      <translation>Detaily</translation>
+        <source>Details</source>
+        <translation>Detaily</translation>
     </message>
     <message>
-      <source>Use custom rotation</source>
-      <translation>Použít vlastní rotaci</translation>
+        <source>Use custom rotation</source>
+        <translation>Použít vlastní rotaci</translation>
     </message>
     <message>
-      <source>Preload this application so that it is available instantly.</source>
-      <translation>Přednahrát aplikaci, aby byla okamžitě k dispozici.</translation>
+        <source>Preload this application so that it is available instantly.</source>
+        <translation>Přednahrát aplikaci, aby byla okamžitě k dispozici.</translation>
     </message>
     <message>
-      <source>The name of this document.</source>
-      <translation>Název tohoto dokumentu.</translation>
+        <source>The name of this document.</source>
+        <translation>Název tohoto dokumentu.</translation>
     </message>
     <message>
-      <source>The media the document resides on.</source>
-      <translation>Médium, na kterém bude dokument umístěn.</translation>
+        <source>The media the document resides on.</source>
+        <translation>Médium, na kterém bude dokument umístěn.</translation>
     </message>
     <message>
-      <source>Type:</source>
-      <translation>Typ:</translation>
+        <source>Type:</source>
+        <translation>Typ:</translation>
     </message>
     <message>
-      <source>Location:</source>
-      <translation>Umístění:</translation>
+        <source>Location:</source>
+        <translation>Umístění:</translation>
     </message>
     <message>
-      <source>Name:</source>
-      <translation>Název:</translation>
+        <source>Name:</source>
+        <translation>Název:</translation>
     </message>
     <message>
-      <source>Fast load (consumes memory)</source>
-      <translation>Přednahrání (spotřebovává paměť)</translation>
+        <source>Fast load (consumes memory)</source>
+        <translation>Přednahrání (spotřebovává paměť)</translation>
     </message>
     <message>
-      <source>Comment:</source>
-      <translation>Komentář:</translation>
+        <source>Comment:</source>
+        <translation>Komentář:</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Delete this document.</source>
-      <translation>Smazat tento dokument.</translation>
+        <source>Delete this document.</source>
+        <translation>Smazat tento dokument.</translation>
     </message>
     <message>
-      <source>Copy</source>
-      <translation>Kopírovat</translation>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
     </message>
     <message>
-      <source>Make a copy of this document.</source>
-      <translation>Vytvořit kopii tohoto dokumentu.</translation>
+        <source>Make a copy of this document.</source>
+        <translation>Vytvořit kopii tohoto dokumentu.</translation>
     </message>
     <message>
-      <source>Beam</source>
-      <translation>Poslat infra</translation>
+        <source>Beam</source>
+        <translation>Poslat infra</translation>
     </message>
     <message>
-      <source>Beam this document to another device.</source>
-      <translation>Pošle tento dokument do jiného zařízení.</translation>
+        <source>Beam this document to another device.</source>
+        <translation>Pošle tento dokument do jiného zařízení.</translation>
     </message>
     <message>
-      <source>Arguments:</source>
-      <translation>Argumenty:</translation>
+        <source>Arguments:</source>
+        <translation>Argumenty:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>OwnerDlg</name>
     <message>
-      <source>Owner Information</source>
-      <translation>Informace o majiteli</translation>
+        <source>Owner Information</source>
+        <translation>Informace o majiteli</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PasswordBase</name>
     <message>
-      <source>1</source>
-      <translation>1</translation>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
-      <source>2</source>
-      <translation>2</translation>
+        <source>2</source>
+        <translation>2</translation>
     </message>
     <message>
-      <source>3</source>
-      <translation>3</translation>
+        <source>3</source>
+        <translation>3</translation>
     </message>
     <message>
-      <source>4</source>
-      <translation>4</translation>
+        <source>4</source>
+        <translation>4</translation>
     </message>
     <message>
-      <source>5</source>
-      <translation>5</translation>
+        <source>5</source>
+        <translation>5</translation>
     </message>
     <message>
-      <source>6</source>
-      <translation>6</translation>
+        <source>6</source>
+        <translation>6</translation>
     </message>
     <message>
-      <source>7</source>
-      <translation>7</translation>
+        <source>7</source>
+        <translation>7</translation>
     </message>
     <message>
-      <source>8</source>
-      <translation>8</translation>
+        <source>8</source>
+        <translation>8</translation>
     </message>
     <message>
-      <source>9</source>
-      <translation>9</translation>
+        <source>9</source>
+        <translation>9</translation>
     </message>
     <message>
-      <source>0</source>
-      <translation>0</translation>
+        <source>0</source>
+        <translation>0</translation>
     </message>
     <message>
-      <source>OK</source>
-      <translation>OK</translation>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-      <source>Enter passcode</source>
-      <translation>Zadejte heslo</translation>
+        <source>Enter passcode</source>
+        <translation>Zadejte heslo</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QMessageBox</name>
     <message>
-      <source>Yes</source>
-      <translation>Ano</translation>
+        <source>Yes</source>
+        <translation>Ano</translation>
     </message>
     <message>
-      <source>No</source>
-      <translation>Ne</translation>
+        <source>No</source>
+        <translation>Ne</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Jan</source>
-      <translation>Led</translation>
+        <source>Jan</source>
+        <translation>Led</translation>
     </message>
     <message>
-      <source>Feb</source>
-      <translation>Úno</translation>
+        <source>Feb</source>
+        <translation>Úno</translation>
     </message>
     <message>
-      <source>Mar</source>
-      <translation>Bře</translation>
+        <source>Mar</source>
+        <translation>Bře</translation>
     </message>
     <message>
-      <source>Apr</source>
-      <translation>Dub</translation>
+        <source>Apr</source>
+        <translation>Dub</translation>
     </message>
     <message>
-      <source>May</source>
-      <translation>Kvě</translation>
+        <source>May</source>
+        <translation>Kvě</translation>
     </message>
     <message>
-      <source>Jun</source>
-      <translation>Čen</translation>
+        <source>Jun</source>
+        <translation>Čen</translation>
     </message>
     <message>
-      <source>Jul</source>
-      <translation>Čec</translation>
+        <source>Jul</source>
+        <translation>Čec</translation>
     </message>
     <message>
-      <source>Aug</source>
-      <translation>Srp</translation>
+        <source>Aug</source>
+        <translation>Srp</translation>
     </message>
     <message>
-      <source>Sep</source>
-      <translation>Zář</translation>
+        <source>Sep</source>
+        <translation>Zář</translation>
     </message>
     <message>
-      <source>Oct</source>
-      <translation>Říj</translation>
+        <source>Oct</source>
+        <translation>Říj</translation>
     </message>
     <message>
-      <source>Nov</source>
-      <translation>Lis</translation>
+        <source>Nov</source>
+        <translation>Lis</translation>
     </message>
     <message>
-      <source>Dec</source>
-      <translation>Pro</translation>
+        <source>Dec</source>
+        <translation>Pro</translation>
     </message>
     <message>
-      <source>Mon</source>
-      <translation>Pon</translation>
+        <source>Mon</source>
+        <translation>Pon</translation>
     </message>
     <message>
-      <source>Tue</source>
-      <translation>Úte</translation>
+        <source>Tue</source>
+        <translation>Úte</translation>
     </message>
     <message>
-      <source>Wed</source>
-      <translation>Stř</translation>
+        <source>Wed</source>
+        <translation>Stř</translation>
     </message>
     <message>
-      <source>Thu</source>
-      <translation>Čtv</translation>
+        <source>Thu</source>
+        <translation>Čtv</translation>
     </message>
     <message>
-      <source>Fri</source>
-      <translation>Pát</translation>
+        <source>Fri</source>
+        <translation>Pát</translation>
     </message>
     <message>
-      <source>Sat</source>
-      <translation>Sob</translation>
+        <source>Sat</source>
+        <translation>Sob</translation>
     </message>
     <message>
-      <source>Sun</source>
-      <translation>Neď</translation>
+        <source>Sun</source>
+        <translation>Neď</translation>
     </message>
     <message>
-      <source>New Document</source>
-      <translation>Nový dokument</translation>
+        <source>New Document</source>
+        <translation>Nový dokument</translation>
     </message>
     <message>
-      <source>&lt;Qt>Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p>To use context-sensitive help:&lt;p>&lt;ol>&lt;li>click and hold the help button.&lt;li>when the title bar shows &lt;b>What's this...&lt;/b>, click on any control.&lt;/ol>&lt;/Qt></source>
-      <translation>&lt;Qt>Pro tuto aplikaci není k dispozici celková nápověda, ale jen kontextová.&lt;p>Pro použití kontextové nápovědy:&lt;p>&lt;ol>&lt;li>stiskněte a podržte tlačítko nápověda.&lt;li>Až se ukáže lišta &lt;b>Co je to...&lt;/b>, klikněte na jakékoliv ovládání.&lt;/ol>&lt;/Qt></translation>
+        <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;Pro tuto aplikaci není k dispozici celková nápověda, ale jen kontextová.&lt;p&gt;Pro použití kontextové nápovědy:&lt;p&gt;&lt;ol&gt;&lt;li&gt;stiskněte a podržte tlačítko nápověda.&lt;li&gt;Až se ukáže lišta &lt;b&gt;Co je to...&lt;/b&gt;, klikněte na jakékoliv ovládání.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
-      <source>What's this...</source>
-      <translation>Co je to...</translation>
+        <source>What&apos;s this...</source>
+        <translation>Co je to...</translation>
     </message>
     <message>
-      <source>Out of Space</source>
-      <translation>Došlo místo</translation>
+        <source>Out of Space</source>
+        <translation>Došlo místo</translation>
     </message>
     <message>
-      <source>There was a problem creating
+        <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
-      <translation>Nastal problém s vytvořením
+        <translation>Nastal problém s vytvořením
 konfigurace pro tento
 program.
 
@@ -523,472 +522,472 @@ Prosím uvolněte nějaké místo
 a zkuste to znovu.</translation>
     </message>
     <message>
-      <source>Unable to create start up files
+        <source>Unable to create start up files
 Please free up some space
 before entering data</source>
-      <translation>Nelze vytvořit startovací soubory
+        <translation>Nelze vytvořit startovací soubory
 Prosím uvolněte nějaké místo
 před zadáním dat</translation>
     </message>
     <message>
-      <source>Unable to schedule alarm.
+        <source>Unable to schedule alarm.
 Free some memory and try again.</source>
-      <translation>Nelze naplánovat alarm.
+        <translation>Nelze naplánovat alarm.
 Uvolněte nějakou paměť a zkuste to znovu.</translation>
     </message>
     <message>
-      <source>Y</source>
-      <translation>R</translation>
+        <source>Y</source>
+        <translation>R</translation>
     </message>
     <message>
-      <source>day</source>
-      <translation>den</translation>
+        <source>day</source>
+        <translation>den</translation>
     </message>
     <message>
-      <source>month</source>
-      <translation>měsíc</translation>
+        <source>month</source>
+        <translation>měsíc</translation>
     </message>
     <message>
-      <source>year</source>
-      <translation>rok</translation>
+        <source>year</source>
+        <translation>rok</translation>
     </message>
     <message>
-      <source>PM</source>
-      <translation>PM</translation>
+        <source>PM</source>
+        <translation>PM</translation>
     </message>
     <message>
-      <source>AM</source>
-      <translation>AM</translation>
+        <source>AM</source>
+        <translation>AM</translation>
     </message>
     <message>
-      <source>&lt;qt>Are you sure you want to delete
- %1?&lt;/qt></source>
-      <translation>&lt;qt>Opravdu chcete smazat
-%1?&lt;/qt></translation>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Opravdu chcete smazat
+%1?&lt;/qt&gt;</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Všechny</translation>
+        <source>All</source>
+        <translation>Všechny</translation>
     </message>
     <message>
-      <source>Unfiled</source>
-      <translation>Nezařazené</translation>
+        <source>Unfiled</source>
+        <translation>Nezařazené</translation>
     </message>
     <message>
-      <source>&lt;b>Work Address:&lt;/b></source>
-      <translation>&lt;b>Adresa zaměstnání:&lt;/b></translation>
+        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Adresa zaměstnání:&lt;/b&gt;</translation>
     </message>
     <message>
-      <source>&lt;b>Home Address:&lt;/b></source>
-      <translation>&lt;b>Adresa domů:&lt;/b></translation>
+        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Adresa domů:&lt;/b&gt;</translation>
     </message>
     <message>
-      <source>Email Addresses: </source>
-      <translation>Adresa emailu:</translation>
+        <source>Email Addresses: </source>
+        <translation>Adresa emailu:</translation>
     </message>
     <message>
-      <source>Home Phone: </source>
-      <translation>Telefon domů:</translation>
+        <source>Home Phone: </source>
+        <translation>Telefon domů:</translation>
     </message>
     <message>
-      <source>Home Fax: </source>
-      <translation>Fax domů:</translation>
+        <source>Home Fax: </source>
+        <translation>Fax domů:</translation>
     </message>
     <message>
-      <source>Home Mobile: </source>
-      <translation>Mobil domů:</translation>
+        <source>Home Mobile: </source>
+        <translation>Mobil domů:</translation>
     </message>
     <message>
-      <source>Home Web Page: </source>
-      <translation>Domácí web stránka:</translation>
+        <source>Home Web Page: </source>
+        <translation>Domácí web stránka:</translation>
     </message>
     <message>
-      <source>Business Web Page: </source>
-      <translation>Pracovní web stránka:</translation>
+        <source>Business Web Page: </source>
+        <translation>Pracovní web stránka:</translation>
     </message>
     <message>
-      <source>Office: </source>
-      <translation>Kancelář:</translation>
+        <source>Office: </source>
+        <translation>Kancelář:</translation>
     </message>
     <message>
-      <source>Business Phone: </source>
-      <translation>Telefon do práce:</translation>
+        <source>Business Phone: </source>
+        <translation>Telefon do práce:</translation>
     </message>
     <message>
-      <source>Business Fax: </source>
-      <translation>Fax do práce:</translation>
+        <source>Business Fax: </source>
+        <translation>Fax do práce:</translation>
     </message>
     <message>
-      <source>Business Mobile: </source>
-      <translation>Pracovní mobil:</translation>
+        <source>Business Mobile: </source>
+        <translation>Pracovní mobil:</translation>
     </message>
     <message>
-      <source>Business Pager: </source>
-      <translation>Pracovní pager:</translation>
+        <source>Business Pager: </source>
+        <translation>Pracovní pager:</translation>
     </message>
     <message>
-      <source>Profession: </source>
-      <translation>Profese:</translation>
+        <source>Profession: </source>
+        <translation>Profese:</translation>
     </message>
     <message>
-      <source>Assistant: </source>
-      <translation>Asistent:</translation>
+        <source>Assistant: </source>
+        <translation>Asistent:</translation>
     </message>
     <message>
-      <source>Manager: </source>
-      <translation>Vedoucí:</translation>
+        <source>Manager: </source>
+        <translation>Vedoucí:</translation>
     </message>
     <message>
-      <source>Male</source>
-      <translation>Muž</translation>
+        <source>Male</source>
+        <translation>Muž</translation>
     </message>
     <message>
-      <source>Female</source>
-      <translation>Žena</translation>
+        <source>Female</source>
+        <translation>Žena</translation>
     </message>
     <message>
-      <source>Gender: </source>
-      <translation>Pohlaví:</translation>
+        <source>Gender: </source>
+        <translation>Pohlaví:</translation>
     </message>
     <message>
-      <source>Spouse: </source>
-      <translation>Manžel(ka):</translation>
+        <source>Spouse: </source>
+        <translation>Manžel(ka):</translation>
     </message>
     <message>
-      <source>Birthday: </source>
-      <translation>Narozeniny:</translation>
+        <source>Birthday: </source>
+        <translation>Narozeniny:</translation>
     </message>
     <message>
-      <source>Anniversary: </source>
-      <translation>Výročí:</translation>
+        <source>Anniversary: </source>
+        <translation>Výročí:</translation>
     </message>
     <message>
-      <source>Nickname: </source>
-      <translation>Přezdívka:</translation>
+        <source>Nickname: </source>
+        <translation>Přezdívka:</translation>
     </message>
     <message>
-      <source>Name Title</source>
-      <translation>Jméno</translation>
+        <source>Name Title</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>First Name</source>
-      <translation>Jméno</translation>
+        <source>First Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Middle Name</source>
-      <translation>Druhé jméno</translation>
+        <source>Middle Name</source>
+        <translation>Druhé jméno</translation>
     </message>
     <message>
-      <source>Last Name</source>
-      <translation>Příjmení</translation>
+        <source>Last Name</source>
+        <translation>Příjmení</translation>
     </message>
     <message>
-      <source>Suffix</source>
-      <translation>Přípona</translation>
+        <source>Suffix</source>
+        <translation>Přípona</translation>
     </message>
     <message>
-      <source>File As</source>
-      <translation>Soubor jako</translation>
+        <source>File As</source>
+        <translation>Soubor jako</translation>
     </message>
     <message>
-      <source>Job Title</source>
-      <translation>Název práce</translation>
+        <source>Job Title</source>
+        <translation>Název práce</translation>
     </message>
     <message>
-      <source>Department</source>
-      <translation>Oddělení</translation>
+        <source>Department</source>
+        <translation>Oddělení</translation>
     </message>
     <message>
-      <source>Company</source>
-      <translation>Firma</translation>
+        <source>Company</source>
+        <translation>Firma</translation>
     </message>
     <message>
-      <source>Business Phone</source>
-      <translation>Telefon do práce</translation>
+        <source>Business Phone</source>
+        <translation>Telefon do práce</translation>
     </message>
     <message>
-      <source>Business Fax</source>
-      <translation>Fax do práce</translation>
+        <source>Business Fax</source>
+        <translation>Fax do práce</translation>
     </message>
     <message>
-      <source>Business Mobile</source>
-      <translation>Mobil do práce</translation>
+        <source>Business Mobile</source>
+        <translation>Mobil do práce</translation>
     </message>
     <message>
-      <source>Default Email</source>
-      <translation>Výchozí email</translation>
+        <source>Default Email</source>
+        <translation>Výchozí email</translation>
     </message>
     <message>
-      <source>Emails</source>
-      <translation>Emaily</translation>
+        <source>Emails</source>
+        <translation>Emaily</translation>
     </message>
     <message>
-      <source>Home Phone</source>
-      <translation>Telefon domů</translation>
+        <source>Home Phone</source>
+        <translation>Telefon domů</translation>
     </message>
     <message>
-      <source>Home Fax</source>
-      <translation>Fax domů</translation>
+        <source>Home Fax</source>
+        <translation>Fax domů</translation>
     </message>
     <message>
-      <source>Home Mobile</source>
-      <translation>Mobil domů</translation>
+        <source>Home Mobile</source>
+        <translation>Mobil domů</translation>
     </message>
     <message>
-      <source>Business Street</source>
-      <translation>Ulice do práce</translation>
+        <source>Business Street</source>
+        <translation>Ulice do práce</translation>
     </message>
     <message>
-      <source>Business City</source>
-      <translation>Město do práce</translation>
+        <source>Business City</source>
+        <translation>Město do práce</translation>
     </message>
     <message>
-      <source>Business State</source>
-      <translation>Stát do práce</translation>
+        <source>Business State</source>
+        <translation>Stát do práce</translation>
     </message>
     <message>
-      <source>Business Zip</source>
-      <translation>PSČ do práce</translation>
+        <source>Business Zip</source>
+        <translation>PSČ do práce</translation>
     </message>
     <message>
-      <source>Business Country</source>
-      <translation>Země do práce</translation>
+        <source>Business Country</source>
+        <translation>Země do práce</translation>
     </message>
     <message>
-      <source>Business Pager</source>
-      <translation>Pager do práce</translation>
+        <source>Business Pager</source>
+        <translation>Pager do práce</translation>
     </message>
     <message>
-      <source>Business WebPage</source>
-      <translation>Pracovní web stránka</translation>
+        <source>Business WebPage</source>
+        <translation>Pracovní web stránka</translation>
     </message>
     <message>
-      <source>Office</source>
-      <translation>Kancelář</translation>
+        <source>Office</source>
+        <translation>Kancelář</translation>
     </message>
     <message>
-      <source>Profession</source>
-      <translation>Profese</translation>
+        <source>Profession</source>
+        <translation>Profese</translation>
     </message>
     <message>
-      <source>Assistant</source>
-      <translation>Asistent</translation>
+        <source>Assistant</source>
+        <translation>Asistent</translation>
     </message>
     <message>
-      <source>Manager</source>
-      <translation>Vedoucí</translation>
+        <source>Manager</source>
+        <translation>Vedoucí</translation>
     </message>
     <message>
-      <source>Home Street</source>
-      <translation>Ulice domů</translation>
+        <source>Home Street</source>
+        <translation>Ulice domů</translation>
     </message>
     <message>
-      <source>Home City</source>
-      <translation>Město domů</translation>
+        <source>Home City</source>
+        <translation>Město domů</translation>
     </message>
     <message>
-      <source>Home State</source>
-      <translation>Stát domů</translation>
+        <source>Home State</source>
+        <translation>Stát domů</translation>
     </message>
     <message>
-      <source>Home Zip</source>
-      <translation>PSČ domů</translation>
+        <source>Home Zip</source>
+        <translation>PSČ domů</translation>
     </message>
     <message>
-      <source>Home Country</source>
-      <translation>Země domů</translation>
+        <source>Home Country</source>
+        <translation>Země domů</translation>
     </message>
     <message>
-      <source>Home Web Page</source>
-      <translation>Domácí web stránka</translation>
+        <source>Home Web Page</source>
+        <translation>Domácí web stránka</translation>
     </message>
     <message>
-      <source>Spouse</source>
-      <translation>Manžel(ka)</translation>
+        <source>Spouse</source>
+        <translation>Manžel(ka)</translation>
     </message>
     <message>
-      <source>Gender</source>
-      <translation>Pohlaví</translation>
+        <source>Gender</source>
+        <translation>Pohlaví</translation>
     </message>
     <message>
-      <source>Birthday</source>
-      <translation>Narozeniny</translation>
+        <source>Birthday</source>
+        <translation>Narozeniny</translation>
     </message>
     <message>
-      <source>Anniversary</source>
-      <translation>Výročí</translation>
+        <source>Anniversary</source>
+        <translation>Výročí</translation>
     </message>
     <message>
-      <source>Nickname</source>
-      <translation>Přezdívka</translation>
+        <source>Nickname</source>
+        <translation>Přezdívka</translation>
     </message>
     <message>
-      <source>Children</source>
-      <translation>Děti</translation>
+        <source>Children</source>
+        <translation>Děti</translation>
     </message>
     <message>
-      <source>Notes</source>
-      <translation>Poznámky</translation>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
     </message>
     <message>
-      <source>Groups</source>
-      <translation>Skupiny</translation>
+        <source>Groups</source>
+        <translation>Skupiny</translation>
     </message>
     <message>
-      <source>D</source>
-      <comment>Shortcut for Day</comment>
-      <translation>D</translation>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation>D</translation>
     </message>
     <message>
-      <source>M</source>
-      <comment>Shortcur for Month</comment>
-      <translation>M</translation>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation>M</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QPEApplication</name>
     <message>
-      <source>%1 document</source>
-      <translation>Dokument %1</translation>
+        <source>%1 document</source>
+        <translation>Dokument %1</translation>
     </message>
     <message>
-      <source>Please wait...</source>
-      <translation>Prosím čekejte...</translation>
+        <source>Please wait...</source>
+        <translation>Prosím čekejte...</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QPEManager</name>
     <message>
-      <source>Click to close this window, discarding changes.</source>
-      <translation>Klikněte pro zavření okna, změny budou ztraceny.</translation>
+        <source>Click to close this window, discarding changes.</source>
+        <translation>Klikněte pro zavření okna, změny budou ztraceny.</translation>
     </message>
     <message>
-      <source>Click to close this window.</source>
-      <translation>Klikněte pro zavření okna.</translation>
+        <source>Click to close this window.</source>
+        <translation>Klikněte pro zavření okna.</translation>
     </message>
     <message>
-      <source>Click to close this window and apply changes.</source>
-      <translation>Klikněte pro zavření okna s aplikováním změn.</translation>
+        <source>Click to close this window and apply changes.</source>
+        <translation>Klikněte pro zavření okna s aplikováním změn.</translation>
     </message>
     <message>
-      <source>Click to make this window movable.</source>
-      <translation>Klikněte sem, pokud chcete toto okno posouvatelné.</translation>
+        <source>Click to make this window movable.</source>
+        <translation>Klikněte sem, pokud chcete toto okno posouvatelné.</translation>
     </message>
     <message>
-      <source>Click to make this window use all available screen area.</source>
-      <translation>Klikněte sem pro použití celé obrazovky pro okno.</translation>
+        <source>Click to make this window use all available screen area.</source>
+        <translation>Klikněte sem pro použití celé obrazovky pro okno.</translation>
     </message>
     <message>
-      <source>Restore</source>
-      <translation>Obnovit</translation>
+        <source>Restore</source>
+        <translation>Obnovit</translation>
     </message>
     <message>
-      <source>Move</source>
-      <translation>Přesunout</translation>
+        <source>Move</source>
+        <translation>Přesunout</translation>
     </message>
     <message>
-      <source>Size</source>
-      <translation>Velikost</translation>
+        <source>Size</source>
+        <translation>Velikost</translation>
     </message>
     <message>
-      <source>Maximize</source>
-      <translation>Maximalizovat</translation>
+        <source>Maximize</source>
+        <translation>Maximalizovat</translation>
     </message>
     <message>
-      <source>Close</source>
-      <translation>Zavřít</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
-      <source>CF Card</source>
-      <translation>Karta CF</translation>
+        <source>CF Card</source>
+        <translation>Karta CF</translation>
     </message>
     <message>
-      <source>Hard Disk</source>
-      <translation>Hard Disk</translation>
+        <source>Hard Disk</source>
+        <translation>Hard Disk</translation>
     </message>
     <message>
-      <source>SD Card</source>
-      <translation>Karta SD</translation>
+        <source>SD Card</source>
+        <translation>Karta SD</translation>
     </message>
     <message>
-      <source>MMC Card</source>
-      <translation>Karta MMC</translation>
+        <source>MMC Card</source>
+        <translation>Karta MMC</translation>
     </message>
     <message>
-      <source>SCSI Hard Disk</source>
-      <translation>SCSI Hard Disk</translation>
+        <source>SCSI Hard Disk</source>
+        <translation>SCSI Hard Disk</translation>
     </message>
     <message>
-      <source>Internal Memory</source>
-      <translation>Interní paměť</translation>
+        <source>Internal Memory</source>
+        <translation>Interní paměť</translation>
     </message>
     <message>
-      <source>Internal Storage</source>
-      <translation>Interní disk</translation>
+        <source>Internal Storage</source>
+        <translation>Interní disk</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>TZCombo</name>
     <message>
-      <source>None</source>
-      <translation>Žádný</translation>
+        <source>None</source>
+        <translation>Žádný</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>TimeZoneSelector</name>
     <message>
-      <source>citytime executable not found</source>
-      <translation>Program citytime nebyl nalezen</translation>
+        <source>citytime executable not found</source>
+        <translation>Program citytime nebyl nalezen</translation>
     </message>
     <message>
-      <source>In order to choose the time zones,
+        <source>In order to choose the time zones,
 please install citytime.</source>
-      <translation>Pro výběr časového pásma nainstalujte
+        <translation>Pro výběr časového pásma nainstalujte
 prosím citytime.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>TimerReceiverObject</name>
     <message>
-      <source>Out of Space</source>
-      <translation>Došlo místo</translation>
+        <source>Out of Space</source>
+        <translation>Došlo místo</translation>
     </message>
     <message>
-      <source>Unable to schedule alarm.
+        <source>Unable to schedule alarm.
 Please free up space and try again</source>
-      <translation>Nelze naplánovat alarm.
+        <translation>Nelze naplánovat alarm.
 Uvolněte nějakou paměť a zkuste to znovu</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>TypeCombo</name>
     <message>
-      <source>%1 files</source>
-      <translation>%1 souborů</translation>
+        <source>%1 files</source>
+        <translation>%1 souborů</translation>
     </message>
     <message>
-      <source>%1 %2</source>
-      <comment>minor mimetype / major mimetype</comment>
-      <translation>%1 %2</translation>
+        <source>%1 %2</source>
+        <comment>minor mimetype / major mimetype</comment>
+        <translation>%1 %2</translation>
     </message>
     <message>
-      <source>All %1 files</source>
-      <translation>Všech %1 souborů</translation>
+        <source>All %1 files</source>
+        <translation>Všech %1 souborů</translation>
     </message>
     <message>
-      <source>All files</source>
-      <translation>Všechny soubory</translation>
+        <source>All files</source>
+        <translation>Všechny soubory</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>WindowDecoration</name>
     <message>
-      <source>Default</source>
-      <comment>List box text for default window decoration</comment>
-      <translation>Výchozí</translation>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation>Výchozí</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libqpickboard.ts b/i18n/cz/libqpickboard.ts
index 7eef6c6..eb06783 100644
--- a/i18n/cz/libqpickboard.ts
+++ b/i18n/cz/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/cz/libqtaux2.ts b/i18n/cz/libqtaux2.ts
index 792a874..3bba83c 100644
--- a/i18n/cz/libqtaux2.ts
+++ b/i18n/cz/libqtaux2.ts
@@ -1,80 +1,79 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>OColorPopupMenu</name>
     <message>
-      <source>More</source>
-      <translation>Více</translation>
+        <source>More</source>
+        <translation>Více</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QColorDialog</name>
     <message>
-      <source>Hu&amp;e:</source>
-      <translation>O&amp;dstín:</translation>
+        <source>Hu&amp;e:</source>
+        <translation>O&amp;dstín:</translation>
     </message>
     <message>
-      <source>&amp;Sat:</source>
-      <translation>&amp;Sytost:</translation>
+        <source>&amp;Sat:</source>
+        <translation>&amp;Sytost:</translation>
     </message>
     <message>
-      <source>&amp;Val:</source>
-      <translation>&amp;Hodnota:</translation>
+        <source>&amp;Val:</source>
+        <translation>&amp;Hodnota:</translation>
     </message>
     <message>
-      <source>&amp;Red:</source>
-      <translation>Če&amp;rvená:</translation>
+        <source>&amp;Red:</source>
+        <translation>Če&amp;rvená:</translation>
     </message>
     <message>
-      <source>&amp;Green:</source>
-      <translation>&amp;Zelená:</translation>
+        <source>&amp;Green:</source>
+        <translation>&amp;Zelená:</translation>
     </message>
     <message>
-      <source>Bl&amp;ue:</source>
-      <translation>&amp;Modrá:</translation>
+        <source>Bl&amp;ue:</source>
+        <translation>&amp;Modrá:</translation>
     </message>
     <message>
-      <source>A&amp;lpha channel:</source>
-      <translation>A&amp;lfa kanál:</translation>
+        <source>A&amp;lpha channel:</source>
+        <translation>A&amp;lfa kanál:</translation>
     </message>
     <message>
-      <source>&amp;Basic colors</source>
-      <translation>&amp;Základní barvy</translation>
+        <source>&amp;Basic colors</source>
+        <translation>&amp;Základní barvy</translation>
     </message>
     <message>
-      <source>&amp;Custom colors</source>
-      <translation>&amp;Vlastní barvy</translation>
+        <source>&amp;Custom colors</source>
+        <translation>&amp;Vlastní barvy</translation>
     </message>
     <message>
-      <source>&amp;Define Custom Colors >></source>
-      <translation>&amp;Definovat vlastní barvy >></translation>
+        <source>&amp;Define Custom Colors &gt;&gt;</source>
+        <translation>&amp;Definovat vlastní barvy &gt;&gt;</translation>
     </message>
     <message>
-      <source>OK</source>
-      <translation>OK</translation>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-      <source>Cancel</source>
-      <translation>Storno</translation>
+        <source>Cancel</source>
+        <translation>Storno</translation>
     </message>
     <message>
-      <source>&amp;Add To Custom Colors</source>
-      <translation>&amp;Přidat k vlastím barvám</translation>
+        <source>&amp;Add To Custom Colors</source>
+        <translation>&amp;Přidat k vlastím barvám</translation>
     </message>
     <message>
-      <source>Select color</source>
-      <translation>Vyberte barvu</translation>
+        <source>Select color</source>
+        <translation>Vyberte barvu</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QInputDialog</name>
     <message>
-      <source>&amp;OK</source>
-      <translation>&amp;OK</translation>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
     </message>
     <message>
-      <source>&amp;Cancel</source>
-      <translation>&amp;Storno</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libscreenshotapplet.ts b/i18n/cz/libscreenshotapplet.ts
index 62b230f..b567f43 100644
--- a/i18n/cz/libscreenshotapplet.ts
+++ b/i18n/cz/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation>Připojení k %1 selhalo.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/libtodayaddressbookplugin.ts b/i18n/cz/libtodayaddressbookplugin.ts
index c37ea03..3e16158 100644
--- a/i18n/cz/libtodayaddressbookplugin.ts
+++ b/i18n/cz/libtodayaddressbookplugin.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPluginConfig</name>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Pro aktivaci nastavení restartujte aplikaci!</translation>
+        <translation type="obsolete">Pro aktivaci nastavení restartujte aplikaci!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
@@ -35,11 +35,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Ukončí řádek po X znacích:</translation>
+        <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>Po kolika znacích bude informace o události ukončena</translation>
+        <translation type="obsolete">Po kolika znacích bude informace o události ukončena</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
diff --git a/i18n/cz/libtodayexampleplugin.ts b/i18n/cz/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/cz/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libtodayweatherplugin.ts b/i18n/cz/libtodayweatherplugin.ts
index 5a7db50..5d21188 100644
--- a/i18n/cz/libtodayweatherplugin.ts
+++ b/i18n/cz/libtodayweatherplugin.ts
@@ -107,11 +107,15 @@ Tlak:</translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation>hPa</translation>
+        <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/cz/libusb.ts b/i18n/cz/libusb.ts
index 1882223..667c075 100644
--- a/i18n/cz/libusb.ts
+++ b/i18n/cz/libusb.ts
@@ -1,25 +1,24 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>USBGUI</name>
     <message>
-      <source>USB</source>
-      <translation>USB</translation>
+        <source>USB</source>
+        <translation>USB</translation>
     </message>
     <message>
-      <source>Nothing to configure</source>
-      <translation>Nic k nastavení</translation>
+        <source>Nothing to configure</source>
+        <translation>Nic k nastavení</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>USBNetNode</name>
     <message>
-      <source>USB Cable Connect</source>
-      <translation>USB spojení kabelem</translation>
+        <source>USB Cable Connect</source>
+        <translation>USB spojení kabelem</translation>
     </message>
     <message>
-      <source>&lt;p>Configure Ethernet over USB.&lt;/p>&lt;p>Use this for a computer to computer USB cable connection&lt;/p></source>
-      <translation>&lt;p>Nastaví Ethernet přes USB.&lt;/p>&lt;p>Požijte pro spojení počítač-počítač USB kabelem&lt;/p></translation>
+        <source>&lt;p&gt;Configure Ethernet over USB.&lt;/p&gt;&lt;p&gt;Use this for a computer to computer USB cable connection&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Nastaví Ethernet přes USB.&lt;/p&gt;&lt;p&gt;Požijte pro spojení počítač-počítač USB kabelem&lt;/p&gt;</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/libvolumeapplet2.ts b/i18n/cz/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/cz/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/cz/libvpn.ts b/i18n/cz/libvpn.ts
index fd7b8bb..3421703 100644
--- a/i18n/cz/libvpn.ts
+++ b/i18n/cz/libvpn.ts
@@ -1,37 +1,40 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>VPNGUI</name>
     <message>
-      <source>VPN</source>
-      <translation>VPN</translation>
+        <source>VPN</source>
+        <translation>VPN</translation>
     </message>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Description</source>
-      <translation>Popis</translation>
+        <source>Description</source>
+        <translation>Popis</translation>
     </message>
     <message>
-      <source>Start automatically</source>
-      <translation>Spustit automaticky</translation>
+        <source>Start automatically</source>
+        <translation>Spustit automaticky</translation>
     </message>
     <message>
-      <source>Confirm before start</source>
-      <translation>Potvrdit před spuštěním</translation>
+        <source>Confirm before start</source>
+        <translation>Potvrdit před spuštěním</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>VPNNetNode</name>
     <message>
-      <source>VPN Connection</source>
-      <translation>VPN připojení</translation>
+        <source>VPN Connection</source>
+        <translation type="obsolete">VPN připojení</translation>
     </message>
     <message>
-      <source>&lt;p>Configure private IP connection.&lt;/p>&lt;p>Defines Secure tunnels over non secure IP sessions&lt;/p></source>
-      <translation>&lt;p>Nastaví privátní IP připojení.&lt;/p>&lt;p>Definuje bezpečné tunely přes nebezpečnou IP síť&lt;/p></translation>
+        <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>
-  </context>
+    <message>
+        <source>VPN connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/cz/libwebstyle.ts b/i18n/cz/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/cz/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/libwlan.ts b/i18n/cz/libwlan.ts
index e44b579..0990208 100644
--- a/i18n/cz/libwlan.ts
+++ b/i18n/cz/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -187,9 +184,14 @@
         <source>Signal</source>
         <translation type="obsolete">Signál</translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
+    <message>
+        <source>SSID</source>
+        <translation type="obsolete">SSID</translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="obsolete">Kanál</translation>
+    </message>
 </context>
 <context>
     <name>WlanInfo</name>
diff --git a/i18n/cz/light-and-power.ts b/i18n/cz/light-and-power.ts
index 7820226..95a47ab 100644
--- a/i18n/cz/light-and-power.ts
+++ b/i18n/cz/light-and-power.ts
@@ -1,183 +1,182 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>Calibration</name>
     <message>
-      <source>%1 Steps</source>
-      <translation>%1 Kroků</translation>
+        <source>%1 Steps</source>
+        <translation>%1 Kroků</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LightSettings</name>
     <message>
-      <source>Backlight &amp;&amp; Contrast</source>
-      <translation>Podsvícení a kontrast</translation>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation>Podsvícení a kontrast</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
-      <source>Light and Power Settings</source>
-      <translation>Nastavení podsvícení a úspory</translation>
+        <source>Light and Power Settings</source>
+        <translation>Nastavení podsvícení a úspory</translation>
     </message>
     <message>
-      <source>on Battery</source>
-      <translation>na baterii</translation>
+        <source>on Battery</source>
+        <translation>na baterii</translation>
     </message>
     <message>
-      <source>General Settings</source>
-      <translation>Hlavní nastavení</translation>
+        <source>General Settings</source>
+        <translation>Hlavní nastavení</translation>
     </message>
     <message>
-      <source>Dim light after</source>
-      <translation>Ztlumit světlo po</translation>
+        <source>Dim light after</source>
+        <translation>Ztlumit světlo po</translation>
     </message>
     <message>
-      <source>Suspend after</source>
-      <translation>Uspat po</translation>
+        <source>Suspend after</source>
+        <translation>Uspat po</translation>
     </message>
     <message>
-      <source>Deactivate LCD only (does not suspend)</source>
-      <translation>Vypne pouze LCD (neusne)</translation>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation>Vypne pouze LCD (neusne)</translation>
     </message>
     <message>
-      <source>CPU Frequency</source>
-      <translation>Frekvence CPU</translation>
+        <source>CPU Frequency</source>
+        <translation>Frekvence CPU</translation>
     </message>
     <message>
-      <source>On closing the hinge</source>
-      <translation>Při zavření displeje</translation>
+        <source>On closing the hinge</source>
+        <translation>Při zavření displeje</translation>
     </message>
     <message>
-      <source> sec</source>
-      <translation>sek</translation>
+        <source> sec</source>
+        <translation>sek</translation>
     </message>
     <message>
-      <source>never</source>
-      <translation>nikdy</translation>
+        <source>never</source>
+        <translation>nikdy</translation>
     </message>
     <message>
-      <source>ignore</source>
-      <translation>ignorovat</translation>
+        <source>ignore</source>
+        <translation>ignorovat</translation>
     </message>
     <message>
-      <source>display off</source>
-      <translation>vypnout displej</translation>
+        <source>display off</source>
+        <translation>vypnout displej</translation>
     </message>
     <message>
-      <source>suspend</source>
-      <translation>uspat</translation>
+        <source>suspend</source>
+        <translation>uspat</translation>
     </message>
     <message>
-      <source>Light off after</source>
-      <translation>Vypnout podsvícení po</translation>
+        <source>Light off after</source>
+        <translation>Vypnout podsvícení po</translation>
     </message>
     <message>
-      <source>Backlight</source>
-      <translation>Podsvícení</translation>
+        <source>Backlight</source>
+        <translation>Podsvícení</translation>
     </message>
     <message>
-      <source>set a fix value for backlight</source>
-      <translation>nastavte pevnou hodnotu podsvícení</translation>
+        <source>set a fix value for backlight</source>
+        <translation>nastavte pevnou hodnotu podsvícení</translation>
     </message>
     <message>
-      <source>set a fix value for contrast</source>
-      <translation>Nastavte pevnou hodnotu kontrastu</translation>
+        <source>set a fix value for contrast</source>
+        <translation>Nastavte pevnou hodnotu kontrastu</translation>
     </message>
     <message>
-      <source>Off</source>
-      <translation>Vypnuté</translation>
+        <source>Off</source>
+        <translation>Vypnuté</translation>
     </message>
     <message>
-      <source>Full</source>
-      <translation>Plné</translation>
+        <source>Full</source>
+        <translation>Plné</translation>
     </message>
     <message>
-      <source>Use Light Sensor</source>
-      <translation>Použít senzor na světlo</translation>
+        <source>Use Light Sensor</source>
+        <translation>Použít senzor na světlo</translation>
     </message>
     <message>
-      <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
-      <translation>Použitím světelného senzoru se bude podsvícení displeje regulovat automaticky podle světla v okolí. Nastavení jasu bude ovšem mít vliv na průměrný jas.</translation>
+        <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
+        <translation>Použitím světelného senzoru se bude podsvícení displeje regulovat automaticky podle světla v okolí. Nastavení jasu bude ovšem mít vliv na průměrný jas.</translation>
     </message>
     <message>
-      <source>Calibrate</source>
-      <translation>Kalibrovat</translation>
+        <source>Calibrate</source>
+        <translation>Kalibrovat</translation>
     </message>
     <message>
-      <source>Advanced settings for light sensor handling</source>
-      <translation>Rozšířené nastavení světelného senzoru</translation>
+        <source>Advanced settings for light sensor handling</source>
+        <translation>Rozšířené nastavení světelného senzoru</translation>
     </message>
     <message>
-      <source>on AC</source>
-      <translation>na síti</translation>
+        <source>on AC</source>
+        <translation>na síti</translation>
     </message>
     <message>
-      <source>Warnings</source>
-      <translation>Varování</translation>
+        <source>Warnings</source>
+        <translation>Varování</translation>
     </message>
     <message>
-      <source>Low power warning interval</source>
-      <translation>Interval varování slabé baterie</translation>
+        <source>Low power warning interval</source>
+        <translation>Interval varování slabé baterie</translation>
     </message>
     <message>
-      <source> %</source>
-      <translation>%</translation>
+        <source> %</source>
+        <translation>%</translation>
     </message>
     <message>
-      <source>At what battery level should the low power warning pop up</source>
-      <translation>Při jaké hodnotě vybití vyskočí varování o slabé baterii</translation>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation>Při jaké hodnotě vybití vyskočí varování o slabé baterii</translation>
     </message>
     <message>
-      <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
-      <translation>Jak často bude kontrolován stav baterie. Toto udává četnost varování při slabé baterii</translation>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation>Jak často bude kontrolován stav baterie. Toto udává četnost varování při slabé baterii</translation>
     </message>
     <message>
-      <source>At what battery level should the critical power warning pop up</source>
-      <translation>Při jaké hodnotě vybití vyskočí varování o kritickém stavu baterie</translation>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation>Při jaké hodnotě vybití vyskočí varování o kritickém stavu baterie</translation>
     </message>
     <message>
-      <source>very low battery warning at</source>
-      <translation>varování velmi vybité baterie při</translation>
+        <source>very low battery warning at</source>
+        <translation>varování velmi vybité baterie při</translation>
     </message>
     <message>
-      <source>critical power warning at</source>
-      <translation>varování kritického vybití při</translation>
+        <source>critical power warning at</source>
+        <translation>varování kritického vybití při</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SensorBase</name>
     <message>
-      <source>Sensor Calibration</source>
-      <translation>Kalibrace Senzoru</translation>
+        <source>Sensor Calibration</source>
+        <translation>Kalibrace Senzoru</translation>
     </message>
     <message>
-      <source>Full</source>
-      <translation>Plné</translation>
+        <source>Full</source>
+        <translation>Plné</translation>
     </message>
     <message>
-      <source>Off</source>
-      <translation>Vypnuto</translation>
+        <source>Off</source>
+        <translation>Vypnuto</translation>
     </message>
     <message>
-      <source>Dark</source>
-      <translation>Tmavé</translation>
+        <source>Dark</source>
+        <translation>Tmavé</translation>
     </message>
     <message>
-      <source>Light</source>
-      <translation>Světlé</translation>
+        <source>Light</source>
+        <translation>Světlé</translation>
     </message>
     <message>
-      <source>Steps</source>
-      <translation>Kroky</translation>
+        <source>Steps</source>
+        <translation>Kroky</translation>
     </message>
     <message>
-      <source>Check interval</source>
-      <translation>Interval snímání</translation>
+        <source>Check interval</source>
+        <translation>Interval snímání</translation>
     </message>
     <message>
-      <source> sec</source>
-      <translation>sek</translation>
+        <source> sec</source>
+        <translation>sek</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/main-tab.ts b/i18n/cz/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/cz/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/mediummount.ts b/i18n/cz/mediummount.ts
index fb02534..4792a26 100644
--- a/i18n/cz/mediummount.ts
+++ b/i18n/cz/mediummount.ts
@@ -1,109 +1,107 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>MediumMountSetting::MainWindow</name>
     <message>
-      <source>Medium Mount Settings</source>
-      <translation>Nastavení připojení média</translation>
+        <source>Medium Mount Settings</source>
+        <translation>Nastavení připojení média</translation>
     </message>
     <message>
-      <source>Global</source>
-      <translation>Globální</translation>
+        <source>Global</source>
+        <translation>Globální</translation>
     </message>
-  </context>
-  <context>
+</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're also able to reconfigure each medium.</source>
-      <translation>Jestliže je médium vloženo do tohoto zařízení, Opie na něm zkusí vyhledat dokumenty. Na větších médiích to může trvat déle. Můžete si vybrat, jestli bude Opie prohledávat média globálně, nebo po médiích. Máte také možnost překonfigurovat každé médium.</translation>
+        <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>Jestliže je médium vloženo do tohoto zařízení, Opie na něm zkusí vyhledat dokumenty. Na větších médiích to může trvat déle. Můžete si vybrat, jestli bude Opie prohledávat média globálně, nebo po médiích. Máte také možnost překonfigurovat každé médium.</translation>
     </message>
     <message>
-      <source>Enable medium checking</source>
-      <translation>Zapnout prohledávání média</translation>
+        <source>Enable medium checking</source>
+        <translation>Zapnout prohledávání média</translation>
     </message>
     <message>
-      <source>Use global settings</source>
-      <translation>Použít globální nastavení</translation>
+        <source>Use global settings</source>
+        <translation>Použít globální nastavení</translation>
     </message>
     <message>
-      <source>Which media files</source>
-      <translation>Které typy souborů</translation>
+        <source>Which media files</source>
+        <translation>Které typy souborů</translation>
     </message>
     <message>
-      <source>Audio</source>
-      <translation>Audio</translation>
+        <source>Audio</source>
+        <translation>Audio</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Všechny</translation>
+        <source>All</source>
+        <translation>Všechny</translation>
     </message>
     <message>
-      <source>Image</source>
-      <translation>Obrázek</translation>
+        <source>Image</source>
+        <translation>Obrázek</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Video</source>
-      <translation>Video</translation>
+        <source>Video</source>
+        <translation>Video</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation></translation>
     </message>
-  </context>
-  <context>
+</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>Konfigurace tohoto média. Změny se aplikují po ukončení aplikace. Pro obnovení záložky Dokumenty musíte médium vyndat a znovu zastrčit.</translation>
+        <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>Konfigurace tohoto média. Změny se aplikují po ukončení aplikace. Pro obnovení záložky Dokumenty musíte médium vyndat a znovu zastrčit.</translation>
     </message>
     <message>
-      <source>Which media files</source>
-      <translation>Které typy souborů</translation>
+        <source>Which media files</source>
+        <translation>Které typy souborů</translation>
     </message>
     <message>
-      <source>Audio</source>
-      <translation>Audio</translation>
+        <source>Audio</source>
+        <translation>Audio</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Všechny</translation>
+        <source>All</source>
+        <translation>Všechny</translation>
     </message>
     <message>
-      <source>Image</source>
-      <translation>Obrázek</translation>
+        <source>Image</source>
+        <translation>Obrázek</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Video</source>
-      <translation>Video</translation>
+        <source>Video</source>
+        <translation>Video</translation>
     </message>
     <message>
-      <source>Limit search to:</source>
-      <translation>Omezit hledání na:</translation>
+        <source>Limit search to:</source>
+        <translation>Omezit hledání na:</translation>
     </message>
     <message>
-      <source>Add</source>
-      <translation>Přidat</translation>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
-      <source>Always check this medium</source>
-      <translation>Vždy prohledávat toto médium</translation>
+        <source>Always check this medium</source>
+        <translation>Vždy prohledávat toto médium</translation>
     </message>
     <message>
-      <source>Remove</source>
-      <translation>Odstranit</translation>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
     <message>
-      <source>Scan whole media</source>
-      <translation>Prohledat celé médium</translation>
+        <source>Scan whole media</source>
+        <translation>Prohledat celé médium</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/minesweep.ts b/i18n/cz/minesweep.ts
index e5c380e..55b9302 100644
--- a/i18n/cz/minesweep.ts
+++ b/i18n/cz/minesweep.ts
@@ -1,34 +1,33 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>MineSweep</name>
     <message>
-      <source>You won!</source>
-      <translation>Vyhrál si!</translation>
+        <source>You won!</source>
+        <translation>Vyhrál si!</translation>
     </message>
     <message>
-      <source>You exploded!</source>
-      <translation>Explodoval si!</translation>
+        <source>You exploded!</source>
+        <translation>Explodoval si!</translation>
     </message>
     <message>
-      <source>Beginner</source>
-      <translation>Začátečník</translation>
+        <source>Beginner</source>
+        <translation>Začátečník</translation>
     </message>
     <message>
-      <source>Advanced</source>
-      <translation>Pokročilý</translation>
+        <source>Advanced</source>
+        <translation>Pokročilý</translation>
     </message>
     <message>
-      <source>Expert</source>
-      <translation>Expert</translation>
+        <source>Expert</source>
+        <translation>Expert</translation>
     </message>
     <message>
-      <source>Game</source>
-      <translation>Hra</translation>
+        <source>Game</source>
+        <translation>Hra</translation>
     </message>
     <message>
-      <source>Mine Sweep</source>
-      <translation>Hledání min</translation>
+        <source>Mine Sweep</source>
+        <translation>Hledání min</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/multiauth.ts b/i18n/cz/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/cz/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/cz/networksettings2.ts b/i18n/cz/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/cz/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/opie-console.ts b/i18n/cz/opie-console.ts
index ea4744c..672ead3 100644
--- a/i18n/cz/opie-console.ts
+++ b/i18n/cz/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation>Upravit klávesu</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation>9600 baudů</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 baudů</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 baudů</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 baudů</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <source>History</source>
         <translation>Historie</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>
@@ -746,7 +792,7 @@
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Vytočení čísla selhalo.</translation>
+        <translation type="obsolete">Vytočení čísla selhalo.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -784,6 +830,14 @@
         <source>Dismiss</source>
         <translation>Odejít</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>
@@ -804,19 +858,19 @@
     </message>
     <message>
         <source>Font size</source>
-        <translation>Velikost písma</translation>
+        <translation type="obsolete">Velikost písma</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>malé</translation>
+        <translation type="obsolete">malé</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>střední</translation>
+        <translation type="obsolete">střední</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>velké</translation>
+        <translation type="obsolete">velké</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/cz/opie-eye.ts b/i18n/cz/opie-eye.ts
index afd9731..335010f 100644
--- a/i18n/cz/opie-eye.ts
+++ b/i18n/cz/opie-eye.ts
@@ -1,73 +1,300 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
-      <source>View as</source>
-      <translation>Zobrazit jako</translation>
+        <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>Beam Current Item</source>
-      <translation>Odeslat aktuální položku</translation>
+        <source>Delete Current Item</source>
+        <translation>Smazat aktální položku</translation>
     </message>
     <message>
-      <source>Delete Current Item</source>
-      <translation>Smazat aktální položku</translation>
+        <source>View Current Item</source>
+        <translation>Zobrazit aktuální položku</translation>
     </message>
     <message>
-      <source>View Current Item</source>
-      <translation>Zobrazit aktuální položku</translation>
+        <source>Show Image Info</source>
+        <translation>Zobrazit informace o obrázku</translation>
     </message>
     <message>
-      <source>Show Image Info</source>
-      <translation>Zobrazit informace o obrázku</translation>
+        <source>Delete Image</source>
+        <translation>Smazat obrázek</translation>
     </message>
     <message>
-      <source>Delete Image</source>
-      <translation>Smazat obrázek</translation>
+        <source>the Image %1</source>
+        <translation>Obrázek %1</translation>
     </message>
     <message>
-      <source>the Image %1</source>
-      <translation>Obrázek %1</translation>
+        <source>Image</source>
+        <translation>Obrázek</translation>
     </message>
     <message>
-      <source>Image</source>
-      <translation>Obrázek</translation>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PMainWindow</name>
     <message>
-      <source>Phunk View - Config</source>
-      <translation>Konfigurace - Phunk View</translation>
+        <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 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>Browser Keyboard Actions</source>
-      <translation>Projít akce klávesnice</translation>
+        <source>Thumbnail and Imageinfo</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Keyboard Configuration</source>
-      <translation>Konfigurace klávesnice</translation>
+        <source>Thumbnail and name</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+    <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>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>%1 - O View</source>
-      <comment>Name of the dir</comment>
-      <translation>%1 - O View</translation>
+        <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 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>
+</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>Opie Eye Caramba</source>
-      <translation>Opie Eye Caramba</translation>
+        <source>Image info</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Show all files</source>
-      <translation>Zobrazit všechny soubory</translation>
+        <source>Displays an thumbnail of the image</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>DirView</source>
-      <translation>Adresáře</translation>
+        <source>Displays info of selected image</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/opie-eye_slave.ts b/i18n/cz/opie-eye_slave.ts
index 5ba7fe4..84c194d 100644
--- a/i18n/cz/opie-eye_slave.ts
+++ b/i18n/cz/opie-eye_slave.ts
@@ -1,374 +1,397 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>@default</name>
     <message>
-      <source>Title</source>
-      <translation>Nadpis</translation>
+        <source>Title</source>
+        <translation>Nadpis</translation>
     </message>
     <message>
-      <source>Author</source>
-      <translation>Autor</translation>
+        <source>Author</source>
+        <translation>Autor</translation>
     </message>
     <message>
-      <source>Description</source>
-      <translation>Popis</translation>
+        <source>Description</source>
+        <translation>Popis</translation>
     </message>
     <message>
-      <source>Copyright</source>
-      <translation>Autorská práva</translation>
+        <source>Copyright</source>
+        <translation>Autorská práva</translation>
     </message>
     <message>
-      <source>Creation Time</source>
-      <translation>Čas vytvoření</translation>
+        <source>Creation Time</source>
+        <translation>Čas vytvoření</translation>
     </message>
     <message>
-      <source>Software</source>
-      <translation>Software</translation>
+        <source>Software</source>
+        <translation>Software</translation>
     </message>
     <message>
-      <source>Disclaimer</source>
-      <translation>Vzdání se práv</translation>
+        <source>Disclaimer</source>
+        <translation>Vzdání se práv</translation>
     </message>
     <message>
-      <source>Warning</source>
-      <translation>Varování</translation>
+        <source>Warning</source>
+        <translation>Varování</translation>
     </message>
     <message>
-      <source>Source</source>
-      <translation>Zdroj</translation>
+        <source>Source</source>
+        <translation>Zdroj</translation>
     </message>
     <message>
-      <source>Comment</source>
-      <translation>Komentář</translation>
+        <source>Comment</source>
+        <translation>Komentář</translation>
     </message>
     <message>
-      <source>Grayscale</source>
-      <translation>Odstíny šedi</translation>
+        <source>Grayscale</source>
+        <translation>Odstíny šedi</translation>
     </message>
     <message>
-      <source>Unknown</source>
-      <translation>Neznámý</translation>
+        <source>Unknown</source>
+        <translation>Neznámý</translation>
     </message>
     <message>
-      <source>RGB</source>
-      <translation>RGB</translation>
+        <source>RGB</source>
+        <translation>RGB</translation>
     </message>
     <message>
-      <source>Palette</source>
-      <translation>Paleta</translation>
+        <source>Palette</source>
+        <translation>Paleta</translation>
     </message>
     <message>
-      <source>Grayscale/Alpha</source>
-      <translation>Odstíny šedi/Průhlednost</translation>
+        <source>Grayscale/Alpha</source>
+        <translation>Odstíny šedi/Průhlednost</translation>
     </message>
     <message>
-      <source>RGB/Alpha</source>
-      <translation>RGB/Průhlednost</translation>
+        <source>RGB/Alpha</source>
+        <translation>RGB/Průhlednost</translation>
     </message>
     <message>
-      <source>Deflate</source>
-      <translation>Deflate</translation>
+        <source>Deflate</source>
+        <translation>Deflate</translation>
     </message>
     <message>
-      <source>None</source>
-      <translation>Žádná</translation>
+        <source>None</source>
+        <translation>Žádná</translation>
     </message>
     <message>
-      <source>Adam7</source>
-      <translation>Adam7</translation>
+        <source>Adam7</source>
+        <translation>Adam7</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Not a GIF file</source>
-      <translation>Není to soubor GIF</translation>
+        <source>Not a GIF file</source>
+        <translation>Není to soubor GIF</translation>
     </message>
     <message>
-      <source>Dimensions: %1x%2
+        <source>Dimensions: %1x%2
 </source>
-      <translation>Rozměry: %1x%2</translation>
+        <translation>Rozměry: %1x%2</translation>
     </message>
     <message>
-      <source>Depth: %1 bits
+        <source>Depth: %1 bits
 </source>
-      <translation>Hloubka: %1 bitů</translation>
+        <translation>Hloubka: %1 bitů</translation>
     </message>
     <message>
-      <source>Sort Flag: %1
+        <source>Sort Flag: %1
 </source>
-      <translation>Řazení: %1</translation>
+        <translation>Řazení: %1</translation>
     </message>
     <message>
-      <source>Size of Global Color Table: %1 colors
+        <source>Size of Global Color Table: %1 colors
 </source>
-      <translation>Velikost globální tabulky barev: %1 barev</translation>
+        <translation>Velikost globální tabulky barev: %1 barev</translation>
     </message>
     <message>
-      <source>Background Color Index: %1
+        <source>Background Color Index: %1
 </source>
-      <translation>Index barvy pozadí: %1</translation>
+        <translation>Index barvy pozadí: %1</translation>
     </message>
     <message>
-      <source>Pixel Aspect Ratio: %1 (Aspect Ratio %2)
+        <source>Pixel Aspect Ratio: %1 (Aspect Ratio %2)
 </source>
-      <translation>Poměr stran bodu: %1 (Poměr stran %2)</translation>
+        <translation>Poměr stran bodu: %1 (Poměr stran %2)</translation>
     </message>
     <message>
-      <source>Comment: %1
+        <source>Comment: %1
 </source>
-      <translation>Komentář: %1</translation>
+        <translation>Komentář: %1</translation>
     </message>
     <message>
-      <source>Depth: %1
+        <source>Depth: %1
 </source>
-      <translation>Hloubka: %1</translation>
+        <translation>Hloubka: %1</translation>
     </message>
     <message>
-      <source>ColorMode: %1
+        <source>ColorMode: %1
 </source>
-      <translation>Režim barev: %1</translation>
+        <translation>Režim barev: %1</translation>
     </message>
     <message>
-      <source>Unknown</source>
-      <translation>Neznámý</translation>
+        <source>Unknown</source>
+        <translation>Neznámý</translation>
     </message>
     <message>
-      <source>Compression: %1
+        <source>Compression: %1
 </source>
-      <translation>Komprese: %1</translation>
+        <translation>Komprese: %1</translation>
     </message>
     <message>
-      <source>InterlaceMode: %1
+        <source>InterlaceMode: %1
 </source>
-      <translation>Prokládaný režim: %1</translation>
+        <translation>Prokládaný režim: %1</translation>
     </message>
     <message>
-      <source>Colormode: Color
+        <source>Colormode: Color
 </source>
-      <translation>Režim barev: Barevný</translation>
+        <translation type="obsolete">Režim barev: Barevný</translation>
     </message>
     <message>
-      <source>Colormode: Black and white
+        <source>Colormode: Black and white
 </source>
-      <translation>Režim barev: Černobílý</translation>
+        <translation type="obsolete">Režim barev: Černobílý</translation>
     </message>
     <message>
-      <source>Basic</source>
-      <translation>Základní</translation>
+        <source>Basic</source>
+        <translation type="obsolete">Základní</translation>
     </message>
     <message>
-      <source>Normal</source>
-      <translation>Normální</translation>
+        <source>Normal</source>
+        <translation type="obsolete">Normální</translation>
     </message>
     <message>
-      <source>Fine</source>
-      <translation>Jemný</translation>
+        <source>Fine</source>
+        <translation type="obsolete">Jemný</translation>
     </message>
     <message>
-      <source>Quality: %1
+        <source>Quality: %1
 </source>
-      <translation>Kvalita: %1</translation>
+        <translation type="obsolete">Kvalita: %1</translation>
     </message>
     <message>
-      <source>Daylight</source>
-      <translation>Denní světlo</translation>
+        <source>Daylight</source>
+        <translation type="obsolete">Denní světlo</translation>
     </message>
     <message>
-      <source>Fluorescent</source>
-      <translation>Zářivka</translation>
+        <source>Fluorescent</source>
+        <translation type="obsolete">Zářivka</translation>
     </message>
     <message>
-      <source>Tungsten</source>
-      <translation>Žárovka</translation>
+        <source>Tungsten</source>
+        <translation type="obsolete">Žárovka</translation>
     </message>
     <message>
-      <source>Standard light A</source>
-      <translation>Standardní světlo A</translation>
+        <source>Standard light A</source>
+        <translation type="obsolete">Standardní světlo A</translation>
     </message>
     <message>
-      <source>Standard light B</source>
-      <translation>Standardní světlo B</translation>
+        <source>Standard light B</source>
+        <translation type="obsolete">Standardní světlo B</translation>
     </message>
     <message>
-      <source>Standard light C</source>
-      <translation>Standardní světlo C</translation>
+        <source>Standard light C</source>
+        <translation type="obsolete">Standardní světlo C</translation>
     </message>
     <message>
-      <source>D55</source>
-      <translation>D55</translation>
+        <source>D55</source>
+        <translation type="obsolete">D55</translation>
     </message>
     <message>
-      <source>D65</source>
-      <translation>D65</translation>
+        <source>D65</source>
+        <translation type="obsolete">D65</translation>
     </message>
     <message>
-      <source>D75</source>
-      <translation>D75</translation>
+        <source>D75</source>
+        <translation type="obsolete">D75</translation>
     </message>
     <message>
-      <source>Other</source>
-      <translation>Jiné</translation>
+        <source>Other</source>
+        <translation type="obsolete">Jiné</translation>
     </message>
     <message>
-      <source>White Balance: %1
+        <source>White Balance: %1
 </source>
-      <translation>Balance bílé: %1</translation>
+        <translation type="obsolete">Balance bílé: %1</translation>
     </message>
     <message>
-      <source>Average</source>
-      <translation>Průměr</translation>
+        <source>Average</source>
+        <translation type="obsolete">Průměr</translation>
     </message>
     <message>
-      <source>Center weighted average</source>
-      <translation>Středově vážený průměr</translation>
+        <source>Center weighted average</source>
+        <translation type="obsolete">Středově vážený průměr</translation>
     </message>
     <message>
-      <source>Spot</source>
-      <translation>Bodové</translation>
+        <source>Spot</source>
+        <translation type="obsolete">Bodové</translation>
     </message>
     <message>
-      <source>MultiSpot</source>
-      <translation>Vícebodové</translation>
+        <source>MultiSpot</source>
+        <translation type="obsolete">Vícebodové</translation>
     </message>
     <message>
-      <source>Pattern</source>
-      <translation>Vzorec</translation>
+        <source>Pattern</source>
+        <translation type="obsolete">Vzorec</translation>
     </message>
     <message>
-      <source>Partial</source>
-      <translation>Částečný</translation>
+        <source>Partial</source>
+        <translation type="obsolete">Částečný</translation>
     </message>
     <message>
-      <source>Metering Mode: %1
+        <source>Metering Mode: %1
 </source>
-      <translation>Režim měření: %1</translation>
+        <translation type="obsolete">Režim měření: %1</translation>
     </message>
     <message>
-      <source>Not defined</source>
-      <translation>Nedefinován</translation>
+        <source>Not defined</source>
+        <translation type="obsolete">Nedefinován</translation>
     </message>
     <message>
-      <source>Manual</source>
-      <translation>Manuální</translation>
+        <source>Manual</source>
+        <translation type="obsolete">Manuální</translation>
     </message>
     <message>
-      <source>Normal progam</source>
-      <translation>Normální program</translation>
+        <source>Normal progam</source>
+        <translation type="obsolete">Normální program</translation>
     </message>
     <message>
-      <source>Aperture priority</source>
-      <translation>Priorita clony</translation>
+        <source>Aperture priority</source>
+        <translation type="obsolete">Priorita clony</translation>
     </message>
     <message>
-      <source>Shutter priority</source>
-      <translation>Priorita času</translation>
+        <source>Shutter priority</source>
+        <translation type="obsolete">Priorita času</translation>
     </message>
     <message>
-      <source>Creative progam
+        <source>Creative progam
 (biased toward fast shutter speed</source>
-      <translation>Kreativní program 
+        <translation type="obsolete">Kreativní program 
 (používá větší rychlost závěrky)</translation>
     </message>
     <message>
-      <source>Action progam
+        <source>Action progam
 (biased toward fast shutter speed)</source>
-      <translation>Akční program
+        <translation type="obsolete">Akční program
 (používá větší rychlost závěrky)</translation>
     </message>
     <message>
-      <source>Portrait mode
+        <source>Portrait mode
 (for closeup photos with the background out of focus)</source>
-      <translation>Režim portrét 
+        <translation type="obsolete">Režim portrét 
 (Pro blízké snímky s rozostřeným pozadím)</translation>
     </message>
     <message>
-      <source>Landscape mode
+        <source>Landscape mode
 (for landscape photos with the background in focus)</source>
-      <translation>Režim krajina 
+        <translation type="obsolete">Režim krajina 
 (pro snímky krajiny se zaostřeným pozadím)</translation>
     </message>
     <message>
-      <source>Exposure Program: %1
+        <source>Exposure Program: %1
 </source>
-      <translation>Expoziční program: %1</translation>
+        <translation type="obsolete">Expoziční program: %1</translation>
     </message>
     <message>
-      <source>Date/Time: %1
+        <source>Date/Time: %1
 </source>
-      <translation>Datum/Čas: %1</translation>
+        <translation>Datum/Čas: %1</translation>
     </message>
     <message>
-      <source>&lt;qt>Comment: %1
+        <source>&lt;qt&gt;Comment: %1
 </source>
-      <translation>&lt;qt>Komentář: %1</translation>
+        <translation>&lt;qt&gt;Komentář: %1</translation>
     </message>
     <message>
-      <source>Manufacturer: %1
+        <source>Manufacturer: %1
 </source>
-      <translation>Výrobce: %1</translation>
+        <translation>Výrobce: %1</translation>
     </message>
     <message>
-      <source>Model: %1
+        <source>Model: %1
 </source>
-      <translation>Model: %1</translation>
+        <translation>Model: %1</translation>
     </message>
     <message>
-      <source>Orientation: %1
+        <source>Orientation: %1
 </source>
-      <translation>Orientace: %1</translation>
+        <translation>Orientace: %1</translation>
     </message>
     <message>
-      <source>Flash used
+        <source>Flash used
 </source>
-      <translation>Použitý blesk</translation>
+        <translation>Použitý blesk</translation>
     </message>
     <message>
-      <source>Focal length: %1
+        <source>Focal length: %1
 </source>
-      <translation>Ohnisková vzdálenost: %1</translation>
+        <translation>Ohnisková vzdálenost: %1</translation>
     </message>
     <message>
-      <source>35mm equivalent: %1
+        <source>35mm equivalent: %1
 </source>
-      <translation>Ekvivalent 35mm: %1</translation>
+        <translation>Ekvivalent 35mm: %1</translation>
     </message>
     <message>
-      <source>CCD width: %1</source>
-      <translation>Šířka CCD: %1</translation>
+        <source>CCD width: %1</source>
+        <translation>Šířka CCD: %1</translation>
     </message>
     <message>
-      <source>Exposure time: %1
+        <source>Exposure time: %1
 </source>
-      <translation>Doba expozice: %1</translation>
+        <translation>Doba expozice: %1</translation>
     </message>
     <message>
-      <source>Aperture: %1
+        <source>Aperture: %1
 </source>
-      <translation>Clona: %1</translation>
+        <translation>Clona: %1</translation>
     </message>
     <message>
-      <source>Distance: %1
+        <source>Distance: %1
 </source>
-      <translation>Vzdálenost: %1</translation>
+        <translation>Vzdálenost: %1</translation>
     </message>
     <message>
-      <source>Infinite</source>
-      <translation>Nekonečno</translation>
+        <source>Infinite</source>
+        <translation>Nekonečno</translation>
     </message>
     <message>
-      <source>ISO equivalent: %1
+        <source>ISO equivalent: %1
 </source>
-      <translation>Ekvivalent ISO: %1</translation>
+        <translation>Ekvivalent ISO: %1</translation>
     </message>
     <message>
-      <source>EXIF comment: %1</source>
-      <translation>EXIF komentář: %1</translation>
+        <source>EXIF comment: %1</source>
+        <translation>EXIF komentář: %1</translation>
     </message>
     <message>
-      <source>&lt;/qt></source>
-      <translation>&lt;/qt></translation>
+        <source>&lt;/qt&gt;</source>
+        <translation>&lt;/qt&gt;</translation>
     </message>
-  </context>
+    <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/cz/opie-login.ts b/i18n/cz/opie-login.ts
index 8b30474..e3d066b 100644
--- a/i18n/cz/opie-login.ts
+++ b/i18n/cz/opie-login.ts
@@ -9,7 +9,7 @@ přesně na kříže.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Vítá vás Opie</translation>
+        <translation type="obsolete">Vítá vás Opie</translation>
     </message>
 </context>
 <context>
@@ -51,7 +51,7 @@ přesně na kříže.</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>&lt;center&gt;Vítá vás OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
+        <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>
@@ -84,4 +84,51 @@ nezachytitelným signálem
         <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 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/cz/opie-sheet.ts b/i18n/cz/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/cz/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/opie-update-symlinks.ts b/i18n/cz/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/cz/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/cz/opieirc.ts b/i18n/cz/opieirc.ts
index f4d33cc..1b34de5 100644
--- a/i18n/cz/opieirc.ts
+++ b/i18n/cz/opieirc.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
@@ -58,6 +58,21 @@
     </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: %1</source>
@@ -117,15 +132,15 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>Přejmenoval jste se na %1</translation>
+        <translation type="obsolete">Přejmenoval jste se na %1</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 se přejmenoval na %2</translation>
+        <translation type="obsolete">%1 se přejmenoval na %2</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Změna přezdívky neznámé osoby</translation>
+        <translation type="obsolete">Změna přezdívky neznámé osoby</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
@@ -149,7 +164,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>Přijato CTCP VERSION od</translation>
+        <translation type="obsolete">Přijato CTCP VERSION od</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -219,6 +234,103 @@
         <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 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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -315,7 +427,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>Port je vyžadován</translation>
+        <translation type="obsolete">Port je vyžadován</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -323,7 +435,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>Skutečné jméno se vyžaduje</translation>
+        <translation type="obsolete">Skutečné jméno se vyžaduje</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -377,7 +489,7 @@ a nezačínající na &apos;#&apos; nebo &apos;+&apos;</translation>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Připojení k</translation>
+        <translation type="obsolete">Připojení k</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -387,6 +499,25 @@ a nezačínající na &apos;#&apos; nebo &apos;+&apos;</translation>
         <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCSession</name>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished">Přejmenoval jste se na %1</translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished">Změna přezdívky neznámé osoby</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished">%1 se přejmenoval na %2</translation>
+    </message>
 </context>
 <context>
     <name>IRCSettings</name>
@@ -466,6 +597,14 @@ a nezačínající na &apos;#&apos; nebo &apos;+&apos;</translation>
         <source>Colors</source>
         <translation>Barvy</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>
@@ -513,4 +652,31 @@ a nezačínající na &apos;#&apos; nebo &apos;+&apos;</translation>
         <translation>Konfigurujte vzhled a chování 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/cz/opiemail.ts b/i18n/cz/opiemail.ts
index 35c4b5a..d18ec88 100644
--- a/i18n/cz/opiemail.ts
+++ b/i18n/cz/opiemail.ts
@@ -1,804 +1,833 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>AccountView</name>
     <message>
-      <source>Error creating new Folder</source>
-      <translation>Nelze vytvořit novou složku</translation>
+        <source>Error creating new Folder</source>
+        <translation>Nelze vytvořit novou složku</translation>
     </message>
     <message>
-      <source>&lt;center>Error while creating&lt;br>new folder - breaking.&lt;/center></source>
-      <translation>&lt;center>Chyba během vytváření&lt;br>nové složky - přerušení.&lt;/center></translation>
+        <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>
+</context>
+<context>
     <name>AddressPicker</name>
     <message>
-      <source>There are no entries in the addressbook.</source>
-      <translation>V adresáři nejsou žádné položky.</translation>
+        <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>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>&lt;p>You have to select at least one address entry.&lt;/p></source>
-      <translation>&lt;p>Vyberte alespoň jednu položku adresáře.&lt;/p></translation>
+        <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>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>AddressPickerUI</name>
     <message>
-      <source>Address Picker</source>
-      <translation>Sběrač adres</translation>
+        <source>Address Picker</source>
+        <translation>Sběrač adres</translation>
     </message>
     <message>
-      <source>Ok</source>
-      <translation>Ok</translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-      <source>Cancel</source>
-      <translation>Storno</translation>
+        <source>Cancel</source>
+        <translation>Storno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ComposeMail</name>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>Size</source>
-      <translation>Velikost</translation>
+        <source>Size</source>
+        <translation>Velikost</translation>
     </message>
     <message>
-      <source>Problem</source>
-      <translation>Problém</translation>
+        <source>Problem</source>
+        <translation>Problém</translation>
     </message>
     <message>
-      <source>&lt;p>Please create an SMTP account first.&lt;/p></source>
-      <translation>&lt;p>Prosím vytvořte nejdříve SMTP účet.&lt;/p></translation>
+        <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>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-      <source>Error</source>
-      <translation>Chyba</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>&lt;p>Please select a File.&lt;/p></source>
-      <translation>&lt;p>Prosím vyberte soubor.&lt;/p></translation>
+        <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>
+        <source>Sending mail</source>
+        <translation>Odesílám zprávu</translation>
     </message>
     <message>
-      <source>No Receiver spezified</source>
-      <translation>Nebyl specifikován příjemce</translation>
+        <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>
+        <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>
+        <source>Store message into drafts?</source>
+        <translation>Uložit zprávu do konceptů?</translation>
     </message>
     <message>
-      <source>Yes</source>
-      <translation>Ano</translation>
+        <source>Yes</source>
+        <translation>Ano</translation>
     </message>
     <message>
-      <source>No</source>
-      <translation>Ne</translation>
+        <source>No</source>
+        <translation>Ne</translation>
     </message>
     <message>
-      <source>&lt;center>Attachments will not be stored in &quot;Draft&quot; folder&lt;/center></source>
-      <translation>&lt;center>Přílohy nebudou uloženy do složky&quot;Koncepty&quot;&lt;/center></translation>
+        <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>
-  </context>
-  <context>
+    <message>
+        <source>No Receiver specified</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ComposeMailUI</name>
     <message>
-      <source>Compose Message</source>
-      <translation>Napsat zprávu</translation>
+        <source>Compose Message</source>
+        <translation>Napsat zprávu</translation>
     </message>
     <message>
-      <source>send later</source>
-      <translation>odeslat později</translation>
+        <source>send later</source>
+        <translation>odeslat později</translation>
     </message>
     <message>
-      <source>use:</source>
-      <translation>použít:</translation>
+        <source>use:</source>
+        <translation>použít:</translation>
     </message>
     <message>
-      <source>Mail</source>
-      <translation>Mail</translation>
+        <source>Mail</source>
+        <translation>Mail</translation>
     </message>
     <message>
-      <source>Subject</source>
-      <translation>Předmět</translation>
+        <source>Subject</source>
+        <translation>Předmět</translation>
     </message>
     <message>
-      <source>From</source>
-      <translation>Od</translation>
+        <source>From</source>
+        <translation>Od</translation>
     </message>
     <message>
-      <source>To</source>
-      <translation>Komu</translation>
+        <source>To</source>
+        <translation>Komu</translation>
     </message>
     <message>
-      <source>Options</source>
-      <translation>Možnosti</translation>
+        <source>Options</source>
+        <translation>Možnosti</translation>
     </message>
     <message>
-      <source>Reply-To</source>
-      <translation>Odpovědět</translation>
+        <source>Reply-To</source>
+        <translation>Odpovědět</translation>
     </message>
     <message>
-      <source>BCC</source>
-      <translation>Slepá kopie</translation>
+        <source>BCC</source>
+        <translation>Slepá kopie</translation>
     </message>
     <message>
-      <source>Signature</source>
-      <translation>Podpis</translation>
+        <source>Signature</source>
+        <translation>Podpis</translation>
     </message>
     <message>
-      <source>CC</source>
-      <translation>Kopie</translation>
+        <source>CC</source>
+        <translation>Kopie</translation>
     </message>
     <message>
-      <source>Attachment</source>
-      <translation>Příloha</translation>
+        <source>Attachment</source>
+        <translation>Příloha</translation>
     </message>
     <message>
-      <source>Delete File</source>
-      <translation>Smazat soubor</translation>
+        <source>Delete File</source>
+        <translation>Smazat soubor</translation>
     </message>
     <message>
-      <source>Add File</source>
-      <translation>Přidat soubor</translation>
+        <source>Add File</source>
+        <translation>Přidat soubor</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>EditAccounts</name>
     <message>
-      <source>Account</source>
-      <translation>Účet</translation>
+        <source>Account</source>
+        <translation>Účet</translation>
     </message>
     <message>
-      <source>Type</source>
-      <translation>Typ</translation>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-      <source>Question</source>
-      <translation>Otázka</translation>
+        <source>Question</source>
+        <translation>Otázka</translation>
     </message>
     <message>
-      <source>&lt;p>Do you really want to delete the selected Account?&lt;/p></source>
-      <translation>&lt;p>Opravdu chcete smazat vybraný účet?&lt;/p></translation>
+        <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>
+        <source>Yes</source>
+        <translation>Ano</translation>
     </message>
     <message>
-      <source>No</source>
-      <translation>Ne</translation>
+        <source>No</source>
+        <translation>Ne</translation>
     </message>
     <message>
-      <source>Error</source>
-      <translation>Chyba</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>&lt;p>Please select an account.&lt;/p></source>
-      <translation>&lt;p>Prosím vyberte účet.&lt;/p></translation>
+        <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>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>EditAccountsUI</name>
     <message>
-      <source>Configure Accounts</source>
-      <translation>Konfigurovat účty</translation>
+        <source>Configure Accounts</source>
+        <translation>Konfigurovat účty</translation>
     </message>
     <message>
-      <source>Mail</source>
-      <translation>Mail</translation>
+        <source>Mail</source>
+        <translation>Mail</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nový</translation>
+        <source>New</source>
+        <translation>Nový</translation>
     </message>
     <message>
-      <source>Name of the Account</source>
-      <translation>Název účtu</translation>
+        <source>Name of the Account</source>
+        <translation>Název účtu</translation>
     </message>
     <message>
-      <source>Edit</source>
-      <translation>Upravit</translation>
+        <source>Edit</source>
+        <translation>Upravit</translation>
     </message>
     <message>
-      <source>News</source>
-      <translation>Novinky</translation>
+        <source>News</source>
+        <translation>Novinky</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>IMAPconfigUI</name>
     <message>
-      <source>Configure IMAP</source>
-      <translation>Konfigurovat IMAP</translation>
+        <source>Configure IMAP</source>
+        <translation>Konfigurovat IMAP</translation>
     </message>
     <message>
-      <source>User</source>
-      <translation>Uživatel</translation>
+        <source>User</source>
+        <translation>Uživatel</translation>
     </message>
     <message>
-      <source>Password</source>
-      <translation>Heslo</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
     <message>
-      <source>Port</source>
-      <translation>Port</translation>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
-      <source>Server</source>
-      <translation>Server</translation>
+        <source>Server</source>
+        <translation>Server</translation>
     </message>
     <message>
-      <source>Name of the Account</source>
-      <translation>Název účtu</translation>
+        <source>Name of the Account</source>
+        <translation>Název účtu</translation>
     </message>
     <message>
-      <source>Account</source>
-      <translation>Účet</translation>
+        <source>Account</source>
+        <translation>Účet</translation>
     </message>
     <message>
-      <source>Prefix</source>
-      <translation>Prefix</translation>
+        <source>Prefix</source>
+        <translation>Prefix</translation>
     </message>
     <message>
-      <source>ssh $SERVER exec</source>
-      <translation>ssh $SERVER exec</translation>
+        <source>ssh $SERVER exec</source>
+        <translation>ssh $SERVER exec</translation>
     </message>
     <message>
-      <source>Use secure sockets:</source>
-      <translation>Použít zabezpečení:</translation>
+        <source>Use secure sockets:</source>
+        <translation>Použít zabezpečení:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
-      <source>Mail</source>
-      <translation>Mail</translation>
+        <source>Mail</source>
+        <translation>Mail</translation>
     </message>
     <message>
-      <source>Settings</source>
-      <translation>Nastavení</translation>
+        <source>Settings</source>
+        <translation>Nastavení</translation>
     </message>
     <message>
-      <source>Compose new mail</source>
-      <translation>Napsat novou zprávu</translation>
+        <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>
+        <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>
+        <source>Show/Hide folders</source>
+        <translation>Ukázat/skrýt složky</translation>
     </message>
     <message>
-      <source>Delete Mail</source>
-      <translation>Smazat zprávu</translation>
+        <source>Delete Mail</source>
+        <translation>Smazat zprávu</translation>
     </message>
     <message>
-      <source>Edit settings</source>
-      <translation>Upravit nastavení</translation>
+        <source>Edit settings</source>
+        <translation>Upravit nastavení</translation>
     </message>
     <message>
-      <source>Configure accounts</source>
-      <translation>Konfigurovat účty</translation>
+        <source>Configure accounts</source>
+        <translation>Konfigurovat účty</translation>
     </message>
     <message>
-      <source>Mailbox</source>
-      <translation>Schránka</translation>
+        <source>Mailbox</source>
+        <translation>Schránka</translation>
     </message>
     <message>
-      <source>Subject</source>
-      <translation>Předmět</translation>
+        <source>Subject</source>
+        <translation>Předmět</translation>
     </message>
     <message>
-      <source>Sender</source>
-      <translation>Odesílatel</translation>
+        <source>Sender</source>
+        <translation>Odesílatel</translation>
     </message>
     <message>
-      <source>Size</source>
-      <translation>Velikost</translation>
+        <source>Size</source>
+        <translation>Velikost</translation>
     </message>
     <message>
-      <source>Date</source>
-      <translation>Datum</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>NNTPGroupsDlg</name>
     <message>
-      <source>Subscribed newsgroups</source>
-      <translation>Přihlášené novinky</translation>
+        <source>Subscribed newsgroups</source>
+        <translation>Přihlášené novinky</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>NNTPGroupsUI</name>
     <message>
-      <source>newsgroupslist</source>
-      <translation>Seznam novinek</translation>
+        <source>newsgroupslist</source>
+        <translation>Seznam novinek</translation>
     </message>
     <message>
-      <source>Newsgroups</source>
-      <translation>Novinky</translation>
+        <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>
+        <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>
+        <source>Groupfilter:</source>
+        <translation>Filtr skupin:</translation>
     </message>
     <message>
-      <source>Enter a filter string here.
+        <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>Sem zadejte filtrovací řetězec.
+        <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>
+        <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>Retrieve the list of groups from server</source>
-      <translation>Přetáhnout seznam skupin ze serveru</translation>
+        <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>
+</context>
+<context>
     <name>NNTPconfigUI</name>
     <message>
-      <source>Configure NNTP</source>
-      <translation>Konfigurovat NNTP</translation>
+        <source>Configure NNTP</source>
+        <translation>Konfigurovat NNTP</translation>
     </message>
     <message>
-      <source>Port</source>
-      <translation>Port</translation>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
-      <source>Name of the Account</source>
-      <translation>Název účtu</translation>
+        <source>Name of the Account</source>
+        <translation>Název účtu</translation>
     </message>
     <message>
-      <source>Account</source>
-      <translation>Účet</translation>
+        <source>Account</source>
+        <translation>Účet</translation>
     </message>
     <message>
-      <source>Server</source>
-      <translation>Server</translation>
+        <source>Server</source>
+        <translation>Server</translation>
     </message>
     <message>
-      <source>Use SSL</source>
-      <translation>Používat SSL</translation>
+        <source>Use SSL</source>
+        <translation>Používat SSL</translation>
     </message>
     <message>
-      <source>User</source>
-      <translation>Uživatel</translation>
+        <source>User</source>
+        <translation>Uživatel</translation>
     </message>
     <message>
-      <source>Password</source>
-      <translation>Heslo</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
     <message>
-      <source>Use Login</source>
-      <translation>Používat přihlašování</translation>
+        <source>Use Login</source>
+        <translation>Používat přihlašování</translation>
     </message>
     <message>
-      <source>Groups</source>
-      <translation>Skupiny</translation>
+        <source>Groups</source>
+        <translation>Skupiny</translation>
     </message>
     <message>
-      <source>Newsgroup</source>
-      <translation>Skupina novinek</translation>
+        <source>Newsgroup</source>
+        <translation>Skupina novinek</translation>
     </message>
     <message>
-      <source>Get newsgroup list from server</source>
-      <translation>Stáhnout seznam skupin ze serveru</translation>
+        <source>Get newsgroup list from server</source>
+        <translation>Stáhnout seznam skupin ze serveru</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Newmdirdlgui</name>
     <message>
-      <source>Enter directory name</source>
-      <translation>Zadejte název adresáře</translation>
+        <source>Enter directory name</source>
+        <translation>Zadejte název adresáře</translation>
     </message>
     <message>
-      <source>Directory name:</source>
-      <translation>Název adresáře:</translation>
+        <source>Directory name:</source>
+        <translation>Název adresáře:</translation>
     </message>
     <message>
-      <source>Directory contains other subdirs</source>
-      <translation>Adresář obsahuje podadresáře</translation>
+        <source>Directory contains other subdirs</source>
+        <translation>Adresář obsahuje podadresáře</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>OpieMail</name>
     <message>
-      <source>Info</source>
-      <translation>Info</translation>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
     <message>
-      <source>Mail queue flushed</source>
-      <translation>Fronta vyprázdněna</translation>
+        <source>Mail queue flushed</source>
+        <translation>Fronta vyprázdněna</translation>
     </message>
     <message>
-      <source>Delete Mail</source>
-      <translation>Smazat zprávu</translation>
+        <source>Delete Mail</source>
+        <translation>Smazat zprávu</translation>
     </message>
     <message>
-      <source>&lt;p>Do you really want to delete this mail? &lt;br>&lt;br></source>
-      <translation>&lt;p>Opravdu chcete smazat tuto zprávu? &lt;br>&lt;br></translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>Error creating new Folder</source>
+        <translation>Nelze vytvořit nová složka</translation>
     </message>
     <message>
-      <source>&lt;center>Error while creating&lt;br>new folder - breaking.&lt;/center></source>
-      <translation>&lt;center>Chyba během vytváření&lt;br>nové složky - přerušení.&lt;/center></translation>
+        <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>
+        <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>
+        <source>Read this posting</source>
+        <translation>Číst tuto zprávu</translation>
     </message>
     <message>
-      <source>Edit this mail</source>
-      <translation>Upravit tuto zprávu</translation>
+        <source>Edit this mail</source>
+        <translation>Upravit tuto zprávu</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>POP3configUI</name>
     <message>
-      <source>Configure POP3</source>
-      <translation>Konfigurace POP3</translation>
+        <source>Configure POP3</source>
+        <translation>Konfigurace POP3</translation>
+    </message>
+    <message>
+        <source>Account</source>
+        <translation>Účet</translation>
     </message>
     <message>
-      <source>Account</source>
-      <translation>Účet</translation>
+        <source>Name of the Account</source>
+        <translation>Název účtu</translation>
     </message>
     <message>
-      <source>Name of the Account</source>
-      <translation>Název účtu</translation>
+        <source>Server</source>
+        <translation>Server</translation>
     </message>
     <message>
-      <source>Server</source>
-      <translation>Server</translation>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
-      <source>Port</source>
-      <translation>Port</translation>
+        <source>Use secure sockets:</source>
+        <translation>Použít zabezpečení:</translation>
     </message>
     <message>
-      <source>Use secure sockets:</source>
-      <translation>Použít zabezpečení:</translation>
+        <source>ssh $SERVER exec imapd</source>
+        <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
-      <source>ssh $SERVER exec imapd</source>
-      <translation>ssh $SERVER exec imapd</translation>
+        <source>User</source>
+        <translation>Uživatel</translation>
     </message>
     <message>
-      <source>User</source>
-      <translation>Uživatel</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
     <message>
-      <source>Password</source>
-      <translation>Heslo</translation>
+        <source>ask before downloading large mails</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+    <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>Konfigurovat SMTP</translation>
+        <source>Configure SMTP</source>
+        <translation>Konfigurovat SMTP</translation>
     </message>
     <message>
-      <source>Account</source>
-      <translation>Účet</translation>
+        <source>Account</source>
+        <translation>Účet</translation>
     </message>
     <message>
-      <source>Use Login</source>
-      <translation>Používat přihlašování</translation>
+        <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>
+        <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>
+        <source>Name of the SMTP Server</source>
+        <translation>Název SMTP serveru</translation>
     </message>
     <message>
-      <source>Password</source>
-      <translation>Heslo</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
     <message>
-      <source>Port</source>
-      <translation>Port</translation>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
-      <source>Server</source>
-      <translation>Server</translation>
+        <source>Server</source>
+        <translation>Server</translation>
     </message>
     <message>
-      <source>Port of the SMTP Server</source>
-      <translation>Port SMTP serveru</translation>
+        <source>Port of the SMTP Server</source>
+        <translation>Port SMTP serveru</translation>
     </message>
     <message>
-      <source>User</source>
-      <translation>Uživatel</translation>
+        <source>User</source>
+        <translation>Uživatel</translation>
     </message>
     <message>
-      <source>Use secure sockets:</source>
-      <translation>Použít zabezpečení:</translation>
+        <source>Use secure sockets:</source>
+        <translation>Použít zabezpečení:</translation>
     </message>
     <message>
-      <source>ssh $SERVER exec</source>
-      <translation>ssh $SERVER exec</translation>
+        <source>ssh $SERVER exec</source>
+        <translation>ssh $SERVER exec</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SelectMailTypeUI</name>
     <message>
-      <source>Select Type</source>
-      <translation>Vyberte typ</translation>
+        <source>Select Type</source>
+        <translation>Vyberte typ</translation>
     </message>
     <message>
-      <source>Select Account Type</source>
-      <translation>Vyberte typ účtu</translation>
+        <source>Select Account Type</source>
+        <translation>Vyberte typ účtu</translation>
     </message>
     <message>
-      <source>IMAP</source>
-      <translation>IMAP</translation>
+        <source>IMAP</source>
+        <translation>IMAP</translation>
     </message>
     <message>
-      <source>POP3</source>
-      <translation>POP3</translation>
+        <source>POP3</source>
+        <translation>POP3</translation>
     </message>
     <message>
-      <source>SMTP</source>
-      <translation>SMTP</translation>
+        <source>SMTP</source>
+        <translation>SMTP</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SettingsDialogUI</name>
     <message>
-      <source>Settings Dialog</source>
-      <translation>Okno nastavení</translation>
+        <source>Settings Dialog</source>
+        <translation>Okno nastavení</translation>
     </message>
     <message>
-      <source>View Mail</source>
-      <translation>Zobrazit zprávu</translation>
+        <source>View Mail</source>
+        <translation>Zobrazit zprávu</translation>
     </message>
     <message>
-      <source>View mail as Html</source>
-      <translation>Zobrazit jako Html</translation>
+        <source>View mail as Html</source>
+        <translation>Zobrazit jako Html</translation>
     </message>
     <message>
-      <source>Compose Mail</source>
-      <translation>Napsat zprávu</translation>
+        <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>
+        <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>
+        <source>Taskbar Applet</source>
+        <translation>Applet na lištu</translation>
     </message>
     <message>
-      <source>Disable Taskbar Applet</source>
-      <translation>Vypnout applet na liště</translation>
+        <source>Disable Taskbar Applet</source>
+        <translation>Vypnout applet na liště</translation>
     </message>
     <message>
-      <source> min</source>
-      <translation>min</translation>
+        <source> min</source>
+        <translation>min</translation>
     </message>
     <message>
-      <source>Check how often</source>
-      <translation>Jak často zkoušet</translation>
+        <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>
+        <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>
+        <source>Play Sound when new mails arrive</source>
+        <translation>Zahrát zvuk při příchodu nové zprávy</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>StatusWidgetUI</name>
     <message>
-      <source>Form1</source>
-      <translation>Form1</translation>
+        <source>Form1</source>
+        <translation>Form1</translation>
     </message>
     <message>
-      <source>TextLabel1</source>
-      <translation>TextLabel1</translation>
+        <source>TextLabel1</source>
+        <translation>TextLabel1</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ViewMail</name>
     <message>
-      <source>Show Text</source>
-      <translation>Zobrazit Text</translation>
+        <source>Show Text</source>
+        <translation>Zobrazit Text</translation>
     </message>
     <message>
-      <source>Save Attachment</source>
-      <translation>Uložit přílohu</translation>
+        <source>Save Attachment</source>
+        <translation>Uložit přílohu</translation>
     </message>
     <message>
-      <source>From</source>
-      <translation>Od</translation>
+        <source>From</source>
+        <translation>Od</translation>
     </message>
     <message>
-      <source>To</source>
-      <translation>Komu</translation>
+        <source>To</source>
+        <translation>Komu</translation>
     </message>
     <message>
-      <source>Cc</source>
-      <translation>Kopie</translation>
+        <source>Cc</source>
+        <translation>Kopie</translation>
     </message>
     <message>
-      <source>Date</source>
-      <translation>Datum</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-      <source>Error</source>
-      <translation>Chyba</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>&lt;p>The mail body is not yet downloaded, so you cannot reply yet.</source>
-      <translation>&lt;p>Tělo zprávy ještě nebylo staženo, nemůžete zatím odpovídat.</translation>
+        <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>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-      <source>&lt;p>The mail body is not yet downloaded, so you cannot forward yet.</source>
-      <translation>&lt;p>Tělo zprávy ještě nebylo staženo, nemůžete zatím přesměrovávat.</translation>
+        <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>
+        <source>Delete Mail</source>
+        <translation>Smazat zprávu</translation>
     </message>
     <message>
-      <source>&lt;p>Do you really want to delete this mail? &lt;br>&lt;br></source>
-      <translation>&lt;p>Opravdu chcete smazat tuto zprávu? &lt;br>&lt;br></translation>
+        <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>
+        <source>Display image preview</source>
+        <translation>Zobrazit náhled obrázku</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>E-Mail by %1</source>
+        <translation type="unfinished">E-Mail podle %1</translation>
+    </message>
+</context>
+<context>
     <name>ViewMailBase</name>
     <message>
-      <source>E-Mail by %1</source>
-      <translation>E-Mail podle %1</translation>
+        <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>Mail</source>
-      <translation>Zpráva</translation>
+        <source>Reply</source>
+        <translation>Odpověď</translation>
     </message>
     <message>
-      <source>Reply</source>
-      <translation>Odpověď</translation>
+        <source>Forward</source>
+        <translation>Přesměrování</translation>
     </message>
     <message>
-      <source>Forward</source>
-      <translation>Přesměrování</translation>
+        <source>Attachments</source>
+        <translation>Přílohy</translation>
     </message>
     <message>
-      <source>Attachments</source>
-      <translation>Přílohy</translation>
+        <source>Show Html</source>
+        <translation>Ukázat Html</translation>
     </message>
     <message>
-      <source>Show Html</source>
-      <translation>Ukázat Html</translation>
+        <source>Delete Mail</source>
+        <translation>Smazat zprávu</translation>
     </message>
     <message>
-      <source>Delete Mail</source>
-      <translation>Smazat zprávu</translation>
+        <source>Description</source>
+        <translation>Popis</translation>
     </message>
     <message>
-      <source>Description</source>
-      <translation>Popis</translation>
+        <source>Filename</source>
+        <translation>Název souboru</translation>
     </message>
     <message>
-      <source>Filename</source>
-      <translation>Název souboru</translation>
+        <source>Size</source>
+        <translation>Velikost</translation>
     </message>
     <message>
-      <source>Size</source>
-      <translation>Velikost</translation>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>selectsmtp</name>
     <message>
-      <source>Select SMTP Account</source>
-      <translation>Vyberte SMTP účet</translation>
+        <source>Select SMTP Account</source>
+        <translation>Vyberte SMTP účet</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>selectstoreui</name>
     <message>
-      <source>Select target box</source>
-      <translation>Okno výběru cíle</translation>
+        <source>Select target box</source>
+        <translation>Okno výběru cíle</translation>
     </message>
     <message>
-      <source>&lt;b>Store mail(s) to&lt;/b></source>
-      <translation>&lt;b>Uložit zprávy do&lt;/b></translation>
+        <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>
+        <source>Folder:</source>
+        <translation>Složka:</translation>
     </message>
     <message>
-      <source>Account:</source>
-      <translation>Účet:</translation>
+        <source>Account:</source>
+        <translation>Účet:</translation>
     </message>
     <message>
-      <source>Create new folder</source>
-      <translation>Vytvořit novou složku</translation>
+        <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>
+        <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>
+        <source>Move mail(s)</source>
+        <translation>Přesunout zprávy</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/opieplayer2.ts b/i18n/cz/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/cz/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/cz/opierec.ts b/i18n/cz/opierec.ts
index abbea83..01d6e70 100644
--- a/i18n/cz/opierec.ts
+++ b/i18n/cz/opierec.ts
@@ -22,7 +22,7 @@
     </message>
     <message>
         <source>Rec</source>
-        <translation>Nahrát</translation>
+        <translation type="obsolete">Nahrát</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -38,11 +38,11 @@
     </message>
     <message>
         <source>Location</source>
-        <translation>Lokalita</translation>
+        <translation type="obsolete">Lokalita</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Datum</translation>
+        <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Files</source>
@@ -78,7 +78,7 @@
     </message>
     <message>
         <source>Stereo Channels</source>
-        <translation>Stereo kanály</translation>
+        <translation type="obsolete">Stereo kanály</translation>
     </message>
     <message>
         <source>In</source>
@@ -102,7 +102,7 @@
     </message>
     <message>
         <source>Stop</source>
-        <translation>Stop</translation>
+        <translation type="obsolete">Stop</translation>
     </message>
     <message>
         <source>Low Disk Space</source>
@@ -118,7 +118,7 @@ nelze rozpoznat kartu</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>sekund</translation>
+        <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;
@@ -180,5 +180,13 @@ vybraný soubor?</translation>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/opimconverter.ts b/i18n/cz/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/cz/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/osearch.ts b/i18n/cz/osearch.ts
index e10fd9f..cf02d02 100644
--- a/i18n/cz/osearch.ts
+++ b/i18n/cz/osearch.ts
@@ -1,133 +1,151 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>MainWindow</name>
     <message>
-      <source>OSearch</source>
-      <translation>OSearch</translation>
+        <source>OSearch</source>
+        <translation>OSearch</translation>
     </message>
     <message>
-      <source>The details of the current result</source>
-      <translation>Detaily aktuálního výsledku</translation>
+        <source>The details of the current result</source>
+        <translation>Detaily aktuálního výsledku</translation>
     </message>
     <message>
-      <source>Applications</source>
-      <translation>Aplikace</translation>
+        <source>Applications</source>
+        <translation>Aplikace</translation>
     </message>
     <message>
-      <source>Documents</source>
-      <translation>Dokumenty</translation>
+        <source>Documents</source>
+        <translation>Dokumenty</translation>
     </message>
     <message>
-      <source>Todo List</source>
-      <translation>Seznam Todo</translation>
+        <source>Todo List</source>
+        <translation>Seznam Todo</translation>
     </message>
     <message>
-      <source>Calendar</source>
-      <translation>Kalendář</translation>
+        <source>Calendar</source>
+        <translation>Kalendář</translation>
     </message>
     <message>
-      <source>Contacts</source>
-      <translation>Kontakty</translation>
+        <source>Contacts</source>
+        <translation>Kontakty</translation>
     </message>
     <message>
-      <source>Search</source>
-      <translation>Hledat</translation>
+        <source>Search</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Settings</source>
-      <translation>Nastavení</translation>
+        <source>Settings</source>
+        <translation>Nastavení</translation>
     </message>
     <message>
-      <source>Search all</source>
-      <translation>Hledat vše</translation>
+        <source>Search all</source>
+        <translation>Hledat vše</translation>
     </message>
     <message>
-      <source>Options</source>
-      <translation>Možnosti</translation>
+        <source>Options</source>
+        <translation>Možnosti</translation>
     </message>
     <message>
-      <source>Case sensitiv</source>
-      <translation>Rozlišovat velikost</translation>
+        <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>
+        <source>Use wildcards</source>
+        <translation>Použít hvězdičkovou konvenci</translation>
     </message>
     <message>
-      <source>Search for: </source>
-      <translation>Hledat:</translation>
+        <source>Search for: </source>
+        <translation>Hledat:</translation>
     </message>
     <message>
-      <source>Enter your search terms here</source>
-      <translation>Sem zadejte hledaná slova</translation>
+        <source>Enter your search terms here</source>
+        <translation>Sem zadejte hledaná slova</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation></translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>OListView</name>
     <message>
-      <source>Results</source>
-      <translation>Výsledky</translation>
+        <source>Results</source>
+        <translation>Výsledky</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>show completed tasks</source>
-      <translation>zobrazit hotové úkoly</translation>
+        <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>show past events</source>
-      <translation>zobrazit minulé události</translation>
+        <source>execute</source>
+        <translation>spustit</translation>
     </message>
     <message>
-      <source>search in dates</source>
-      <translation>hledat ve schůzkách</translation>
+        <source>open in filemanager</source>
+        <translation>otevřít ve správci souborů</translation>
     </message>
     <message>
-      <source>show</source>
-      <translation>zobrazit</translation>
+        <source>File: </source>
+        <translation>Soubor:</translation>
     </message>
     <message>
-      <source>edit</source>
-      <translation>upravit</translation>
+        <source>Link: </source>
+        <translation>Link:</translation>
     </message>
     <message>
-      <source>execute</source>
-      <translation>spustit</translation>
+        <source>Mimetype: </source>
+        <translation>Typ MIME:</translation>
     </message>
     <message>
-      <source>open in filemanager</source>
-      <translation>otevřít ve správci souborů</translation>
+        <source>open with </source>
+        <translation>otevřít pomocí</translation>
     </message>
     <message>
-      <source>File: </source>
-      <translation>Soubor:</translation>
+        <source>search content</source>
+        <translation type="obsolete">hledat obsah</translation>
     </message>
     <message>
-      <source>Link: </source>
-      <translation>Link:</translation>
+        <source>searching %1</source>
+        <translation>hledání %1</translation>
     </message>
     <message>
-      <source>Mimetype: </source>
-      <translation>Typ MIME:</translation>
+        <source>Show completed tasks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>open with </source>
-      <translation>otevřít pomocí</translation>
+        <source>Show past events</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>search content</source>
-      <translation>hledat obsah</translation>
+        <source>Search in dates</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>searching %1</source>
-      <translation>hledání %1</translation>
+        <source>Search content</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/oxygen.ts b/i18n/cz/oxygen.ts
index 2284c1d..f40cf66 100644
--- a/i18n/cz/oxygen.ts
+++ b/i18n/cz/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>Elemetární složení (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/cz/oyatzee.ts b/i18n/cz/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/cz/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/packagemanager.ts b/i18n/cz/packagemanager.ts
index 3307a22..2df03c5 100644
--- a/i18n/cz/packagemanager.ts
+++ b/i18n/cz/packagemanager.ts
@@ -1,259 +1,298 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>FilterDlg</name>
     <message>
-      <source>All</source>
-      <translation>Vše</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-      <source>Installed</source>
-      <translation>Instalované</translation>
+        <source>Installed</source>
+        <translation>Instalované</translation>
     </message>
     <message>
-      <source>Not installed</source>
-      <translation>Nenainstalované</translation>
+        <source>Not installed</source>
+        <translation>Nenainstalované</translation>
     </message>
     <message>
-      <source>Updated</source>
-      <translation>Aktualizované</translation>
+        <source>Updated</source>
+        <translation>Aktualizované</translation>
     </message>
     <message>
-      <source>Filter packages</source>
-      <translation>Filtrovat balíčky</translation>
+        <source>Filter packages</source>
+        <translation>Filtrovat balíčky</translation>
     </message>
     <message>
-      <source>Category:</source>
-      <translation>Kategorie:</translation>
+        <source>Category:</source>
+        <translation>Kategorie:</translation>
     </message>
     <message>
-      <source>Names containing:</source>
-      <translation>Jména obsahující:</translation>
+        <source>Names containing:</source>
+        <translation>Jména obsahující:</translation>
     </message>
     <message>
-      <source>With the status:</source>
-      <translation>Ve stavu:</translation>
+        <source>With the status:</source>
+        <translation>Ve stavu:</translation>
     </message>
     <message>
-      <source>Available from the following server:</source>
-      <translation>K dispozici z následujícího serveru:</translation>
+        <source>Available from the following server:</source>
+        <translation>K dispozici z následujícího serveru:</translation>
     </message>
     <message>
-      <source>Installed on device at:</source>
-      <translation>Instalované na zařízení v:</translation>
+        <source>Installed on device at:</source>
+        <translation>Instalované na zařízení v:</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
-      <source>Destination</source>
-      <translation>Cíl</translation>
+        <source>Destination</source>
+        <translation>Cíl</translation>
     </message>
     <message>
-      <source>Space Avail</source>
-      <translation>Volné místo</translation>
+        <source>Space Avail</source>
+        <translation>Volné místo</translation>
     </message>
     <message>
-      <source>Output</source>
-      <translation>Výstup</translation>
+        <source>Output</source>
+        <translation>Výstup</translation>
     </message>
     <message>
-      <source>Start</source>
-      <translation>Start</translation>
+        <source>Start</source>
+        <translation>Start</translation>
     </message>
     <message>
-      <source>Options</source>
-      <translation>Možnosti</translation>
+        <source>Options</source>
+        <translation>Možnosti</translation>
     </message>
     <message>
-      <source>Packages to </source>
-      <translation>Balíčky do </translation>
+        <source>Packages to </source>
+        <translation>Balíčky do </translation>
     </message>
     <message>
-      <source>install</source>
-      <translation>instalovat</translation>
+        <source>install</source>
+        <translation>instalovat</translation>
     </message>
     <message>
-      <source>remove</source>
-      <translation>odstranit</translation>
+        <source>remove</source>
+        <translation>odstranit</translation>
     </message>
     <message>
-      <source>upgrade</source>
-      <translation>aktualizovat</translation>
+        <source>upgrade</source>
+        <translation>aktualizovat</translation>
     </message>
     <message>
-      <source>download</source>
-      <translation>stáhnout</translation>
+        <source>download</source>
+        <translation>stáhnout</translation>
     </message>
     <message>
-      <source>Press the start button to begin.
+        <source>Press the start button to begin.
 </source>
-      <translation>Pro zahájení stiskněte start.</translation>
+        <translation>Pro zahájení stiskněte start.</translation>
     </message>
     <message>
-      <source>Unknown</source>
-      <translation>Neznámý</translation>
+        <source>Unknown</source>
+        <translation>Neznámý</translation>
     </message>
     <message>
-      <source>%1 Kb</source>
-      <translation>%1 Kb</translation>
+        <source>%1 Kb</source>
+        <translation>%1 Kb</translation>
     </message>
     <message>
-      <source>Abort</source>
-      <translation>Přerušit</translation>
+        <source>Abort</source>
+        <translation>Přerušit</translation>
     </message>
     <message>
-      <source>Close</source>
-      <translation>Zavřít</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
     <message>
-      <source>Save output</source>
-      <translation>Uložit výstup</translation>
+        <source>Save output</source>
+        <translation>Uložit výstup</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Vše</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
-      <source>Type the text to search for here.</source>
-      <translation>Zde zadejte hledaný řetězec.</translation>
+        <source>Type the text to search for here.</source>
+        <translation>Zde zadejte hledaný řetězec.</translation>
     </message>
     <message>
-      <source>Update lists</source>
-      <translation>Obnovit seznamy</translation>
+        <source>Update lists</source>
+        <translation>Obnovit seznamy</translation>
     </message>
     <message>
-      <source>Click here to update package lists from servers.</source>
-      <translation>Pro aktualizaci seznamů balíčků ze serverů klikněte sem.</translation>
+        <source>Click here to update package lists from servers.</source>
+        <translation type="obsolete">Pro aktualizaci seznamů balíčků ze serverů klikněte sem.</translation>
     </message>
     <message>
-      <source>Upgrade</source>
-      <translation>Aktualizovat</translation>
+        <source>Upgrade</source>
+        <translation>Aktualizovat</translation>
     </message>
     <message>
-      <source>Click here to upgrade all installed packages if a newer version is available.</source>
-      <translation>Pro aktualizaci všech instalovaných balíčků na novější verzi klikněte sem.</translation>
+        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <translation type="obsolete">Pro aktualizaci všech instalovaných balíčků na novější verzi klikněte sem.</translation>
     </message>
     <message>
-      <source>Download</source>
-      <translation>Stáhnout</translation>
+        <source>Download</source>
+        <translation>Stáhnout</translation>
     </message>
     <message>
-      <source>Click here to download the currently selected package(s).</source>
-      <translation>Pro stažení vybraných balíčků klikněte sem.</translation>
+        <source>Click here to download the currently selected package(s).</source>
+        <translation type="obsolete">Pro stažení vybraných balíčků klikněte sem.</translation>
     </message>
     <message>
-      <source>Apply changes</source>
-      <translation>Provést změny</translation>
+        <source>Apply changes</source>
+        <translation>Provést 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>
+        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <translation type="obsolete">Klikněte sem pro instalaci, odstranění, nebo aktualizaci vybraných balíčků.</translation>
     </message>
     <message>
-      <source>Configure</source>
-      <translation>Konfigurovat</translation>
+        <source>Configure</source>
+        <translation>Konfigurovat</translation>
     </message>
     <message>
-      <source>Click here to configure this application.</source>
-      <translation>Pro nastavení aplikace klikněte sem.</translation>
+        <source>Click here to configure this application.</source>
+        <translation type="obsolete">Pro nastavení aplikace klikněte sem.</translation>
     </message>
     <message>
-      <source>Actions</source>
-      <translation>Akce</translation>
+        <source>Actions</source>
+        <translation>Akce</translation>
     </message>
     <message>
-      <source>Show packages not installed</source>
-      <translation>Zobrazit nenainstalované balíčky</translation>
+        <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>Pro zobrazení nenainstalovaných balíčků, které jsou k dispozici, klikněte sem.</translation>
+        <source>Click here to show packages available which have not been installed.</source>
+        <translation type="obsolete">Pro zobrazení nenainstalovaných balíčků, které jsou k dispozici, klikněte sem.</translation>
     </message>
     <message>
-      <source>Show installed packages</source>
-      <translation>Zobrazit nainstalované balíčky</translation>
+        <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>Pro zobrazení nainstalovaných balíčků klikněte sem.</translation>
+        <source>Click here to show packages currently installed on this device.</source>
+        <translation type="obsolete">Pro zobrazení nainstalovaných balíčků klikněte sem.</translation>
     </message>
     <message>
-      <source>Show updated packages</source>
-      <translation>Zobrazit aktualizované balíčky</translation>
+        <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>Pro zobrazení nainstalovaných balíčků, které mají novější verzi, klikněte sem.</translation>
+        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <translation type="obsolete">Pro zobrazení nainstalovaných balíčků, které mají novější verzi, klikněte sem.</translation>
     </message>
     <message>
-      <source>Find</source>
-      <translation>Hledat</translation>
+        <source>Find</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Click here to search for text in package names.</source>
-      <translation>Pro hledání řetězce v názvu balíčků klikněte sem.</translation>
+        <source>Click here to search for text in package names.</source>
+        <translation type="obsolete">Pro hledání řetězce v názvu balíčků klikněte sem.</translation>
     </message>
     <message>
-      <source>Find next</source>
-      <translation>Hledat další</translation>
+        <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>Pro hledání dalšího názvu balíčku s hledaným řetězcem klikněte sem.</translation>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <translation type="obsolete">Pro hledání dalšího názvu balíčku s hledaným řetězcem klikněte sem.</translation>
     </message>
     <message>
-      <source>View</source>
-      <translation>Zobrazit</translation>
+        <source>View</source>
+        <translation>Zobrazit</translation>
     </message>
     <message>
-      <source>Click here to hide the find toolbar.</source>
-      <translation>Pro schování hledací lišty klikněte sem.</translation>
+        <source>Click here to hide the find toolbar.</source>
+        <translation type="obsolete">Pro schování hledací lišty klikněte sem.</translation>
     </message>
     <message>
-      <source>Packages</source>
-      <translation>Balíčky</translation>
+        <source>Packages</source>
+        <translation>Balíčky</translation>
     </message>
     <message>
-      <source>Remove</source>
-      <translation>Odstranit</translation>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
     <message>
-      <source>No</source>
-      <translation>Ne</translation>
+        <source>No</source>
+        <translation>Ne</translation>
     </message>
     <message>
-      <source>Yes</source>
-      <translation>Ano</translation>
+        <source>Yes</source>
+        <translation>Ano</translation>
     </message>
     <message>
-      <source>Nothing to do</source>
-      <translation>Nic k práci</translation>
+        <source>Nothing to do</source>
+        <translation>Nic k práci</translation>
     </message>
     <message>
-      <source>No packages selected</source>
-      <translation>Nebyl vybrán balíček</translation>
+        <source>No packages selected</source>
+        <translation>Nebyl vybrán balíček</translation>
     </message>
     <message>
-      <source>OK</source>
-      <translation>OK</translation>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-      <source>This is a listing of all packages.
+        <source>This is a listing of all packages.
 
 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ů. 
+        <translation type="obsolete">Toto je seznam všech balíčků. 
 
 Modrá tečka vedle balíčku říká, že je balíček nainstalován. 
 
@@ -262,214 +301,464 @@ Modrá tečka s hvězdičkou říká, že je k dispozici novější verze na ser
 Pro označení balíčku klikněte do čterečku vlevo.</translation>
     </message>
     <message>
-      <source>Filter</source>
-      <translation>Filtr</translation>
+        <source>Filter</source>
+        <translation>Filtr</translation>
+    </message>
+    <message>
+        <source>Click here to apply current filter.</source>
+        <translation type="obsolete">Pro aplikování filtru klikněte sem.</translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation>Nastavení filtru</translation>
+    </message>
+    <message>
+        <source>Click here to change the package filter criteria.</source>
+        <translation type="obsolete">Pro změnu kritérií filtru balíčků klikněte sem.</translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation>Správce balíčků</translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation>Obnovit informace o balíčcích</translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation>Aktualizovat instalované balíčky</translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation>Zadejte cestu, kam chcete balíček stáhnout:</translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation>Stáhnout balíčky</translation>
     </message>
     <message>
-      <source>Click here to apply current filter.</source>
-      <translation>Pro aplikování filtru klikněte sem.</translation>
+        <source>Remove or upgrade</source>
+        <translation>Odstranit, nebo aktualizovat</translation>
     </message>
     <message>
-      <source>Filter settings</source>
-      <translation>Nastavení filtru</translation>
+        <source>Remove or reinstall</source>
+        <translation>Odstranit, nebo přeinstalovat</translation>
     </message>
     <message>
-      <source>Click here to change the package filter criteria.</source>
-      <translation>Pro změnu kritérií filtru balíčků klikněte sem.</translation>
+        <source>Reinstall</source>
+        <translation>Přeinstalovat</translation>
     </message>
     <message>
-      <source>Package Manager</source>
-      <translation>Správce balíčků</translation>
+        <source>Config updated</source>
+        <translation>Konfigurace aktualizována</translation>
     </message>
     <message>
-      <source>Update package information</source>
-      <translation>Obnovit informace o balíčcích</translation>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation>Konfigurace byla aktualizována. Chcete nyní aktualizovat informace o serverech a balíčcích?</translation>
     </message>
     <message>
-      <source>Upgrade installed packages</source>
-      <translation>Aktualizovat instalované balíčky</translation>
+        <source>This is a listing of all packages.
+
+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.
+
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to update package lists from servers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to download the currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install local package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install a package file located on device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to configure this application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages available which have not been installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Enter path to download package to:</source>
-      <translation>Zadejte cestu, kam chcete balíček stáhnout:</translation>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Download packages</source>
-      <translation>Stáhnout balíčky</translation>
+        <source>Tap here to apply current filter.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Remove or upgrade</source>
-      <translation>Odstranit, nebo aktualizovat</translation>
+        <source>Tap here to change the package filter criteria.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Remove or reinstall</source>
-      <translation>Odstranit, nebo přeinstalovat</translation>
+        <source>Tap here to search for text in package names.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Reinstall</source>
-      <translation>Přeinstalovat</translation>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Config updated</source>
-      <translation>Konfigurace aktualizována</translation>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>The configuration has been updated.  Do you want to update server and package information now?</source>
-      <translation>Konfigurace byla aktualizována. Chcete nyní aktualizovat informace o serverech a balíčcích?</translation>
+        <source>Application Packages</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>OIpkg</name>
     <message>
-      <source>OIpkg</source>
-      <translation>Olpkg</translation>
+        <source>OIpkg</source>
+        <translation type="obsolete">Olpkg</translation>
+    </message>
+    <message>
+        <source>Error initialing libipkg</source>
+        <translation type="obsolete">Chyba inicializace libipkg</translation>
+    </message>
+    <message>
+        <source>Error freeing libipkg</source>
+        <translation type="obsolete">Chyba uvolnění libipkg</translation>
     </message>
     <message>
-      <source>Error initialing libipkg</source>
-      <translation>Chyba inicializace libipkg</translation>
+        <source>Linking packages installed in: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Error freeing libipkg</source>
-      <translation>Chyba uvolnění libipkg</translation>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Links removed for: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>OIpkgConfigDlg</name>
     <message>
-      <source>Configuration</source>
-      <translation>Konfigurace</translation>
+        <source>Configuration</source>
+        <translation>Konfigurace</translation>
     </message>
     <message>
-      <source>Servers</source>
-      <translation>Servery</translation>
+        <source>Servers</source>
+        <translation>Servery</translation>
     </message>
     <message>
-      <source>Destinations</source>
-      <translation>Cíle</translation>
+        <source>Destinations</source>
+        <translation>Cíle</translation>
     </message>
     <message>
-      <source>Proxies</source>
-      <translation>Proxy servery</translation>
+        <source>Proxies</source>
+        <translation>Proxy servery</translation>
     </message>
     <message>
-      <source>Options</source>
-      <translation>Možnosti</translation>
+        <source>Options</source>
+        <translation>Možnosti</translation>
     </message>
     <message>
-      <source>New</source>
-      <translation>Nový</translation>
+        <source>New</source>
+        <translation>Nový</translation>
     </message>
     <message>
-      <source>Delete</source>
-      <translation>Smazat</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
     <message>
-      <source>Server</source>
-      <translation>Server</translation>
+        <source>Server</source>
+        <translation type="obsolete">Server</translation>
     </message>
     <message>
-      <source>Name:</source>
-      <translation>Jméno:</translation>
+        <source>Name:</source>
+        <translation type="obsolete">Jméno:</translation>
     </message>
     <message>
-      <source>Address:</source>
-      <translation>Adresa:</translation>
+        <source>Address:</source>
+        <translation type="obsolete">Adresa:</translation>
     </message>
     <message>
-      <source>Active Server</source>
-      <translation>Aktivní server</translation>
+        <source>Active Server</source>
+        <translation type="obsolete">Aktivní server</translation>
     </message>
     <message>
-      <source>Update</source>
-      <translation>Aktualizovat</translation>
+        <source>Update</source>
+        <translation type="obsolete">Aktualizovat</translation>
     </message>
     <message>
-      <source>HTTP Proxy</source>
-      <translation>HTTP Proxy</translation>
+        <source>HTTP Proxy</source>
+        <translation>HTTP Proxy</translation>
     </message>
     <message>
-      <source>Enabled</source>
-      <translation>Zapnuto</translation>
+        <source>Enabled</source>
+        <translation>Zapnuto</translation>
     </message>
     <message>
-      <source>FTP Proxy</source>
-      <translation>FTP Proxy</translation>
+        <source>FTP Proxy</source>
+        <translation>FTP Proxy</translation>
     </message>
     <message>
-      <source>Username:</source>
-      <translation>Uživ. jméno:</translation>
+        <source>Username:</source>
+        <translation>Uživ. jméno:</translation>
     </message>
     <message>
-      <source>Password:</source>
-      <translation>Heslo:</translation>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
     </message>
     <message>
-      <source>Force Depends</source>
-      <translation>Přemoci závislosti</translation>
+        <source>Force Depends</source>
+        <translation>Přemoci závislosti</translation>
     </message>
     <message>
-      <source>Force Reinstall</source>
-      <translation>Vynutit přeinstalování</translation>
+        <source>Force Reinstall</source>
+        <translation>Vynutit přeinstalování</translation>
     </message>
     <message>
-      <source>Force Remove</source>
-      <translation>Vynutit odstranění</translation>
+        <source>Force Remove</source>
+        <translation>Vynutit odstranění</translation>
     </message>
     <message>
-      <source>Force Overwrite</source>
-      <translation>Vynutit přepsání</translation>
+        <source>Force Overwrite</source>
+        <translation>Vynutit přepsání</translation>
     </message>
     <message>
-      <source>Information Level</source>
-      <translation>Informační úroveň</translation>
+        <source>Information Level</source>
+        <translation>Informační úroveň</translation>
     </message>
     <message>
-      <source>Errors only</source>
-      <translation>Pouze chyby</translation>
+        <source>Errors only</source>
+        <translation>Pouze chyby</translation>
     </message>
     <message>
-      <source>Normal messages</source>
-      <translation>Normální zprávy</translation>
+        <source>Normal messages</source>
+        <translation>Normální zprávy</translation>
     </message>
     <message>
-      <source>Informative messages</source>
-      <translation>Informativní zprávy</translation>
+        <source>Informative messages</source>
+        <translation>Informativní zprávy</translation>
     </message>
     <message>
-      <source>Troubleshooting output</source>
-      <translation>Výstup při řešení problémů</translation>
+        <source>Troubleshooting output</source>
+        <translation>Výstup při řešení problémů</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Jméno:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Jméno:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Adresa:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>OPackageManager</name>
     <message>
-      <source>Reading available packages:
+        <source>Reading available packages:
 </source>
-      <translation>Načítám dostupné balíčky:</translation>
+        <translation type="obsolete">Načítám dostupné balíčky:</translation>
     </message>
     <message>
-      <source>Reading installed packages:
+        <source>Reading installed packages:
 </source>
-      <translation>Načítám instalované balíčky:</translation>
+        <translation type="obsolete">Načítám instalované balíčky:</translation>
+    </message>
+    <message>
+        <source>Reading available packages:
+<byte value="x9"/></source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Reading installed packages:
+<byte value="x9"/></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>PackageInfoDlg</name>
     <message>
-      <source>Information</source>
-      <translation>Informace</translation>
+        <source>Information</source>
+        <translation>Informace</translation>
+    </message>
+    <message>
+        <source>Unable to retrieve package information.</source>
+        <translation>Nemohu stáhnout informace o balíčku.</translation>
+    </message>
+    <message>
+        <source>Retrieve file list</source>
+        <translation>Stáhnout seznam souborů</translation>
+    </message>
+    <message>
+        <source>File list</source>
+        <translation>Seznam souborů</translation>
     </message>
     <message>
-      <source>Unable to retrieve package information.</source>
-      <translation>Nemohu stáhnout informace o balíčku.</translation>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Retrieve file list</source>
-      <translation>Stáhnout seznam souborů</translation>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>File list</source>
-      <translation>Seznam souborů</translation>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/powerchord.ts b/i18n/cz/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/cz/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/cz/pyquicklauncher.ts b/i18n/cz/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/cz/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/cz/qpe.ts b/i18n/cz/qpe.ts
index ea60387..bf59c77 100644
--- a/i18n/cz/qpe.ts
+++ b/i18n/cz/qpe.ts
@@ -1,411 +1,424 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>@default</name>
     <message>
-      <source>Language</source>
-      <translation>Jazyk</translation>
+        <source>Language</source>
+        <translation>Jazyk</translation>
     </message>
     <message>
-      <source>DocTab</source>
-      <translation>Záložka dokumentů</translation>
+        <source>DocTab</source>
+        <translation>Záložka dokumentů</translation>
     </message>
     <message>
-      <source>Time and Date</source>
-      <translation>Datum a čas</translation>
+        <source>Time and Date</source>
+        <translation>Datum a čas</translation>
     </message>
     <message>
-      <source>Personal Information</source>
-      <translation>Osobní informace</translation>
+        <source>Personal Information</source>
+        <translation>Osobní informace</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>AppLauncher</name>
     <message>
-      <source>Application Problem</source>
-      <translation>Aplikační problém</translation>
+        <source>Application Problem</source>
+        <translation>Aplikační problém</translation>
     </message>
     <message>
-      <source>&lt;p>%1 is not responding.&lt;/p></source>
-      <translation>&lt;p>%1 neodpovídá.&lt;/p></translation>
+        <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>Would you like to force the application to exit?&lt;/p></source>
-      <translation>&lt;p>Opravdu chcete násilně ukončit aplikaci?&lt;/p></translation>
+        <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>&lt;p>Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt></source>
-      <translation>&lt;qt>&lt;p>Rychlé nahrávání bylo pro tuto aplikaci vypnuto.  Stiskněte a podržte ikonu aplikace pro její znovuzapnutí.&lt;/qt></translation>
+        <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>&lt;b>%1&lt;/b> was terminated due to signal code %2&lt;/qt></source>
-      <translation>&lt;qt>&lt;b>%1&lt;/b> byla přerušena z důvodu signálového kódu %2&lt;/qt></translation>
+        <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>
+        <source>Application terminated</source>
+        <translation>Aplikace ukončena</translation>
     </message>
     <message>
-      <source>Application not found</source>
-      <translation>Aplikace nenalezena</translation>
+        <source>Application not found</source>
+        <translation>Aplikace nenalezena</translation>
     </message>
     <message>
-      <source>&lt;qt>Could not locate application &lt;b>%1&lt;/b>&lt;/qt></source>
-      <translation>&lt;qt>Nelze nalézt aplikaci &lt;b>%1&lt;/b>&lt;/qt></translation>
+        <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>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>&lt;qt>Could not find the application %1&lt;/qt></source>
-      <translation>&lt;qt>Nelze nalézt aplikaci %1&lt;/qt></translation>
+        <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>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Calibrate</name>
     <message>
-      <source>Touch the crosshairs firmly and
+        <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-      <translation>Pro kalibraci obrazovky stiskněte 
+        <translation>Pro kalibraci obrazovky stiskněte 
 kříže pevně a přesně.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>DesktopPowerAlerter</name>
     <message>
-      <source>Battery Status</source>
-      <translation>Stav baterie</translation>
+        <source>Battery Status</source>
+        <translation>Stav baterie</translation>
     </message>
     <message>
-      <source>Low Battery</source>
-      <translation>Slabá baterie</translation>
+        <source>Low Battery</source>
+        <translation>Slabá baterie</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FirstUse</name>
     <message>
-      <source>&lt;&lt; Back</source>
-      <translation>&lt;&lt; Zpět</translation>
+        <source>&lt;&lt; Back</source>
+        <translation>&lt;&lt; Zpět</translation>
     </message>
     <message>
-      <source>Next >></source>
-      <translation>Dále >></translation>
+        <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>
+        <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>
+        <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>
+        <source>Please wait...</source>
+        <translation>Prosím čekejte...</translation>
     </message>
     <message>
-      <source>Finish</source>
-      <translation>Hotovo</translation>
+        <source>Finish</source>
+        <translation>Hotovo</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
-      <source>Unicode</source>
-      <translation>Unicode</translation>
+        <source>Unicode</source>
+        <translation>Unicode</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Launcher</name>
     <message>
-      <source>Launcher</source>
-      <translation>Spouštěč</translation>
+        <source>Launcher</source>
+        <translation>Spouštěč</translation>
     </message>
     <message>
-      <source>Documents</source>
-      <translation>Dokumenty</translation>
+        <source>Documents</source>
+        <translation>Dokumenty</translation>
     </message>
     <message>
-      <source> - Launcher</source>
-      <translation> - Spouštěč</translation>
+        <source> - Launcher</source>
+        <translation> - Spouštěč</translation>
     </message>
     <message>
-      <source>No application</source>
-      <translation>Bez aplikace</translation>
+        <source>No application</source>
+        <translation>Bez aplikace</translation>
     </message>
     <message>
-      <source>&lt;p>No application is defined for this document.&lt;p>Type is %1.</source>
-      <translation>&lt;p>Pro tento dokument nebyla nastavena žádná aplikace&lt;p>Typ je %1.</translation>
+        <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>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-      <source>View as text</source>
-      <translation>Zobrazit jako text</translation>
+        <source>View as text</source>
+        <translation>Zobrazit jako text</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LauncherTabWidget</name>
     <message>
-      <source>&lt;b>Finding Documents...&lt;/b></source>
-      <translation>&lt;b>Hledám Dokumenty...&lt;/b></translation>
+        <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>The Documents Tab&lt;p>has been disabled.&lt;p>Use Settings->Launcher->DocTab&lt;p>to reenable it.&lt;/b>&lt;/center></source>
-      <translation>&lt;b>Záložka Dokumenty&lt;p>byla vypnutá.&lt;p>Použijte Nastavení->Spouštěč->Záložka Dokumenty&lt;p>pro její opětovné zapnutí.&lt;/b>&lt;/center></translation>
+        <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>
+        <source>Icon View</source>
+        <translation>Zobrazení s ikonami</translation>
     </message>
     <message>
-      <source>List View</source>
-      <translation>Zobrazení seznamu</translation>
+        <source>List View</source>
+        <translation>Zobrazení seznamu</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>LauncherView</name>
     <message>
-      <source>All types</source>
-      <translation>Všechny typy</translation>
+        <source>All types</source>
+        <translation>Všechny typy</translation>
     </message>
     <message>
-      <source>Document View</source>
-      <translation>Zobrazení dokumentů</translation>
+        <source>Document View</source>
+        <translation>Zobrazení dokumentů</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Mediadlg</name>
     <message>
-      <source>A new storage media detected:</source>
-      <translation>Bylo detekováno nové úložné médium:</translation>
+        <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>
+        <source>What should I do with it?</source>
+        <translation>Co bych s ním měl udělat?</translation>
     </message>
-  </context>
-  <context>
+</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>
+        <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>
+        <source>Which media files</source>
+        <translation>Které soubory médií</translation>
     </message>
     <message>
-      <source>Audio</source>
-      <translation>Zvuk</translation>
+        <source>Audio</source>
+        <translation>Zvuk</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Všechny</translation>
+        <source>All</source>
+        <translation>Všechny</translation>
     </message>
     <message>
-      <source>Image</source>
-      <translation>Obrázek</translation>
+        <source>Image</source>
+        <translation>Obrázek</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Video</source>
-      <translation>Video</translation>
+        <source>Video</source>
+        <translation>Video</translation>
     </message>
     <message>
-      <source>Limit search to:</source>
-      <translation>Omezit hledání na:</translation>
+        <source>Limit search to:</source>
+        <translation>Omezit hledání na:</translation>
     </message>
     <message>
-      <source>Add</source>
-      <translation>Přidat</translation>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
-      <source>Remove</source>
-      <translation>Odstranit</translation>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
     <message>
-      <source>Scan whole media</source>
-      <translation>Skenovat celé médium</translation>
+        <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>
+        <source>Always check this medium</source>
+        <translation>Vždy prohledat toto médium</translation>
     </message>
-  </context>
-  <context>
+</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>Bezpečný režim</translation>
+        <source>Safe Mode</source>
+        <translation>Bezpečný režim</translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation>Správce pluginů...</translation>
     </message>
     <message>
-      <source>Plugin Manager...</source>
-      <translation>Správce pluginů...</translation>
+        <source>Restart Qtopia</source>
+        <translation>Restartovat Qtopii</translation>
     </message>
     <message>
-      <source>Restart Qtopia</source>
-      <translation>Restartovat Qtopii</translation>
+        <source>Help...</source>
+        <translation>Pomoc...</translation>
     </message>
+</context>
+<context>
+    <name>Server</name>
     <message>
-      <source>Help...</source>
-      <translation>Pomoc...</translation>
+        <source>USB Lock</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ServerApplication</name>
     <message>
-      <source>Information</source>
-      <translation>Informace</translation>
+        <source>Information</source>
+        <translation>Informace</translation>
     </message>
     <message>
-      <source>&lt;p>The system date doesn't seem to be valid.
-(%1)&lt;/p>&lt;p>Do you want to correct the clock ?&lt;/p></source>
-      <translation>&lt;p>Vypadá to, že systémový čas jde špatně.
-(%1)&lt;/p>&lt;p>Chcete hodiny nastavit ?&lt;/p></translation>
+        <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>
+        <source>WARNING</source>
+        <translation>VAROVÁNÍ</translation>
     </message>
     <message>
-      <source>&lt;p>The battery level is critical!&lt;p>Keep power off until AC is restored</source>
-      <translation>&lt;p>Stav baterie je kritický!&lt;p>Nechte vypnuto, dokud nepřipojíte zdroj</translation>
+        <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>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-      <source>The battery is running very low. </source>
-      <translation>Baterie je velmi slabá</translation>
+        <source>The battery is running very low. </source>
+        <translation>Baterie je velmi slabá</translation>
     </message>
     <message>
-      <source>&lt;p>The Back-up battery is very low&lt;p>Please charge the back-up battery</source>
-      <translation>&lt;p>Záložní baterie je velmi slabá&lt;p>Prosím nabijte záložní baterii</translation>
+        <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>
+        <source>business card</source>
+        <translation>vizitka</translation>
     </message>
     <message>
-      <source>Safe Mode</source>
-      <translation>Bezpečný režim</translation>
+        <source>Safe Mode</source>
+        <translation>Bezpečný režim</translation>
     </message>
     <message>
-      <source>&lt;P>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>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>
+        <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>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-      <source>Plugin Manager...</source>
-      <translation>Správce pluginů...</translation>
+        <source>Plugin Manager...</source>
+        <translation>Správce pluginů...</translation>
     </message>
     <message>
-      <source>Memory Status</source>
-      <translation>Stav paměti</translation>
+        <source>Memory Status</source>
+        <translation>Stav paměti</translation>
     </message>
     <message>
-      <source>Memory Low
+        <source>Memory Low
 Please save data.</source>
-      <translation>Málo paměti
+        <translation>Málo paměti
 Prosím uložte data.</translation>
     </message>
     <message>
-      <source>Critical Memory Shortage
+        <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
-      <translation>Kritický nedostatek paměti.
+        <translation>Kritický nedostatek paměti.
 Prosím ukončete okamžitě
 tuto aplikaci.</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
-      <source>Shutdown...</source>
-      <translation>Vypnutí...</translation>
+        <source>Shutdown...</source>
+        <translation>Vypnutí...</translation>
     </message>
     <message>
-      <source>Terminate</source>
-      <translation>Ukončit</translation>
+        <source>Terminate</source>
+        <translation>Ukončit</translation>
     </message>
     <message>
-      <source>Terminate Opie</source>
-      <translation>Ukončit Opii</translation>
+        <source>Terminate Opie</source>
+        <translation>Ukončit Opii</translation>
     </message>
     <message>
-      <source>Reboot</source>
-      <translation>Přebootovat</translation>
+        <source>Reboot</source>
+        <translation>Přebootovat</translation>
     </message>
     <message>
-      <source>Restart Opie</source>
-      <translation>Restartovat Opii</translation>
+        <source>Restart Opie</source>
+        <translation>Restartovat Opii</translation>
     </message>
     <message>
-      <source>Shutdown</source>
-      <translation>Vypnout</translation>
+        <source>Shutdown</source>
+        <translation>Vypnout</translation>
     </message>
     <message>
-      <source>&lt;p>
+        <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-      <translation>&lt;p>
+        <translation>&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>
+        <source>Cancel</source>
+        <translation>Storno</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SyncAuthentication</name>
     <message>
-      <source>Sync Connection</source>
-      <translation>Připojení synchronizace</translation>
+        <source>Sync Connection</source>
+        <translation>Připojení synchronizace</translation>
     </message>
     <message>
-      <source>&lt;qt>&lt;p>An unauthorized system is requesting access to this device.&lt;p>You chose IntelliSync so you may I allow or deny this connection.&lt;/qt></source>
-      <translation>&lt;qt>&lt;p>Neautorizovaný systém se pokouší připojit k tomuto zařízení.&lt;p>Vyberte IntelliSync a můžete spojení přijmout, nebo odmítnout.&lt;/qt></translation>
+        <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>
+        <source>Allow</source>
+        <translation>Přijmout</translation>
     </message>
     <message>
-      <source>Deny</source>
-      <translation>Odmítnout</translation>
+        <source>Deny</source>
+        <translation>Odmítnout</translation>
     </message>
     <message>
-      <source>&lt;p>An unauthorized system is requesting access to this device.&lt;p>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>&lt;p>Neautorizovaný systém se pokouší připojit k tomuto zařízení.&lt;p>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></translation>
+        <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>An unrecognized system is requesting access to this device.&lt;p>If you have just initiated a Sync for the first time, this is normal.</source>
-      <translation>&lt;p>Neznámé zařízení se pokouší připojit k tomuto zařízení.&lt;p>Jestliže jste spustili synchronizaci poprvé, tak je to normální.</translation>
+        <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>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
-      <source>Abort</source>
-      <translation>Přerušit</translation>
+        <source>Abort</source>
+        <translation>Přerušit</translation>
     </message>
     <message>
-      <source>Syncing:</source>
-      <translation>Synchronizace:</translation>
+        <source>Syncing:</source>
+        <translation>Synchronizace:</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/quicklauncher.ts b/i18n/cz/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/cz/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/cz/security.ts b/i18n/cz/security.ts
index 174c57a..6d2972c 100644
--- a/i18n/cz/security.ts
+++ b/i18n/cz/security.ts
@@ -1,184 +1,235 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>LoginBase</name>
     <message>
-      <source>LoginBase</source>
-      <translation>Login báze</translation>
+        <source>LoginBase</source>
+        <translation>Login báze</translation>
     </message>
     <message>
-      <source>Login</source>
-      <translation>Přihlášení</translation>
+        <source>Login</source>
+        <translation>Přihlášení</translation>
     </message>
     <message>
-      <source>Login Automatically</source>
-      <translation>Automaticky přihlásit</translation>
+        <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.  
+        <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.
+        <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
+        <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í.
+        <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>
+</context>
+<context>
     <name>MultiauthConfig</name>
     <message>
-      <source>Security configuration</source>
-      <translation>Konfigurace zabezpečení</translation>
+        <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>
+        <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>
+        <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>
+        <source>Move Up</source>
+        <translation>Posunout nahoru</translation>
     </message>
     <message>
-      <source>Move Down</source>
-      <translation>Posunout dolů</translation>
+        <source>Move Down</source>
+        <translation>Posunout dolů</translation>
     </message>
     <message>
-      <source>plugins</source>
-      <translation>pluginy</translation>
+        <source>plugins</source>
+        <translation>pluginy</translation>
     </message>
     <message>
-      <source>Authentication</source>
-      <translation>Ověření</translation>
+        <source>Authentication</source>
+        <translation>Ověření</translation>
     </message>
     <message>
-      <source>Login</source>
-      <translation>Přihlášení</translation>
+        <source>Login</source>
+        <translation>Přihlášení</translation>
     </message>
     <message>
-      <source>Sync</source>
-      <translation>Synchronizace</translation>
+        <source>Sync</source>
+        <translation>Synchronizace</translation>
     </message>
     <message>
-      <source>Attention</source>
-      <translation>Upozornění</translation>
+        <source>Attention</source>
+        <translation>Upozornění</translation>
     </message>
     <message>
-      <source>&lt;p>All user-defined net ranges will be lost.</source>
-      <translation>&lt;p>Všechny uživatelovy síťové rozsahy budou ztraceny.</translation>
+        <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>
+        <source>Cancel</source>
+        <translation>Storno</translation>
     </message>
     <message>
-      <source>Ok</source>
-      <translation>Ok</translation>
+        <source>Ok</source>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
-      <source>192.168.129.0/24</source>
-      <translation>192.168.129.0/24</translation>
+        <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>192.168.1.0/24</translation>
+        <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>192.168.0.0/16</translation>
+        <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>172.16.0.0/12</translation>
+        <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>10.0.0.0/8</translation>
+        <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>1.0.0.0/8</translation>
+        <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>
+        <source>Any</source>
+        <translation>Jakákoliv</translation>
     </message>
     <message>
-      <source>None</source>
-      <translation>Žádná</translation>
+        <source>None</source>
+        <translation>Žádná</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
+</context>
+<context>
     <name>MultiauthGeneralConfig</name>
     <message>
-      <source>When to lock Opie</source>
-      <translation>Kdy zamknout Opii</translation>
+        <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>on Opie start</source>
-      <translation>při startu Opie</translation>
+        <source>Multiple plugins authentication</source>
+        <translation>Ověření více pluginy</translation>
     </message>
     <message>
-      <source>on Opie resume</source>
-      <translation>při probuzení Opie</translation>
+        <source>Required successes</source>
+        <translation>Pažadavek proběhl</translation>
     </message>
     <message>
-      <source>Multiple plugins authentication</source>
-      <translation>Ověření více pluginy</translation>
+        <source>Debug options</source>
+        <translation type="obsolete">Ladící možnosti</translation>
     </message>
     <message>
-      <source>Required successes</source>
-      <translation>Pažadavek proběhl</translation>
+        <source>Don&apos;t protect this config screen</source>
+        <translation>Nechránit toto konfigurační okno</translation>
     </message>
     <message>
-      <source>Debug options</source>
-      <translation>Ladící možnosti</translation>
+        <source>Show explanatory screens</source>
+        <translation>Zobrazovat obrazovky s vysvětlením</translation>
     </message>
     <message>
-      <source>Don't protect this config screen</source>
-      <translation>Nechránit toto konfigurační okno</translation>
+        <source>Allow to bypass authentication</source>
+        <translation type="obsolete">Umožnit překlenout ověřování</translation>
     </message>
     <message>
-      <source>Show explanatory screens</source>
-      <translation>Zobrazovat obrazovky s vysvětlením</translation>
+        <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>Allow to bypass authentication</source>
-      <translation>Umožnit překlenout ověřování</translation>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Note: the third option implies the second one</source>
-      <translation>Poznámka: Třetí možnost obsahuje druhou</translation>
+        <source>Testing</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Test the authentication now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished">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 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">Storno</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncBase</name>
     <message>
-      <source>SyncBase</source>
-      <translation>Sync báze</translation>
+        <source>SyncBase</source>
+        <translation>Sync báze</translation>
     </message>
     <message>
-      <source>Sync</source>
-      <translation>Synchronizace</translation>
+        <source>Sync</source>
+        <translation>Synchronizace</translation>
     </message>
     <message>
-      <source>Accept sync from network:</source>
-      <translation>Akceptovat synchronizaci ze sítě:</translation>
+        <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.  
+        <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.  
 
@@ -188,7 +239,7 @@ 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ý.
+        <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.
 
@@ -200,17 +251,17 @@ 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>
+        <source>Delete Entry</source>
+        <translation>Smazat položku</translation>
     </message>
     <message>
-      <source>Delete the selected net range from the list
+        <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
+        <translation>Vymaže vybraný síťový rozsah ze seznamu
 
 Po stisknutí tohoto tlačítka bude vybraný síťový rozsah vymazán ze seznamu.
 
@@ -218,45 +269,53 @@ Jestliže stisknete tlačítko omylem, požitím tlačítka &quot;Obnovit výcho
 seznam sítí do stavu jako po prvním nastartování Zauruse.</translation>
     </message>
     <message>
-      <source>Restore Defaults</source>
-      <translation>Obnovit výchozí</translation>
+        <source>Restore Defaults</source>
+        <translation>Obnovit výchozí</translation>
     </message>
     <message>
-      <source>This button will restore the list of net ranges
+        <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
+        <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>
+        <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>
+        <source>Qtopia 1.7</source>
+        <translation>Qtopia 1.7</translation>
     </message>
     <message>
-      <source>Opie 1.0</source>
-      <translation>Opie 1.0</translation>
+        <source>Opie 1.0</source>
+        <translation>Opie 1.0</translation>
     </message>
     <message>
-      <source>IntelliSync</source>
-      <translation>IntelliSync</translation>
+        <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'll be prompted to accept the connection.
+        <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>Vyzkoušejte synchronizační protokoly pro různá zařízení.
+        <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>
-  </context>
+    <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/cz/sfcave-sdl.ts b/i18n/cz/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/cz/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/cz/sfcave.ts b/i18n/cz/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/cz/sfcave.ts
+++ b/i18n/cz/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/cz/simple-icon.ts b/i18n/cz/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/cz/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/simple-main.ts b/i18n/cz/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/cz/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/simple-pim.ts b/i18n/cz/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/cz/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/simple.ts b/i18n/cz/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/cz/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/stocktickertest.ts b/i18n/cz/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/cz/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/sysinfo.ts b/i18n/cz/sysinfo.ts
index 9a93b85..5529a45 100644
--- a/i18n/cz/sysinfo.ts
+++ b/i18n/cz/sysinfo.ts
@@ -1,149 +1,148 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!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>
+        <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>
+        <source>Tests</source>
+        <translation>Testy</translation>
     </message>
     <message>
-      <source>Results</source>
-      <translation>Výsledky</translation>
+        <source>Results</source>
+        <translation>Výsledky</translation>
     </message>
     <message>
-      <source>Comparison</source>
-      <translation>Porovnání</translation>
+        <source>Comparison</source>
+        <translation>Porovnání</translation>
     </message>
     <message>
-      <source>1. Integer Arithmetic  </source>
-      <translation>1. Celočíselná aritmetika  </translation>
+        <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>
+        <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>
+        <source>3. Text Rendering  </source>
+        <translation>3. Zobrazování textu  </translation>
     </message>
     <message>
-      <source>4. Gfx Rendering  </source>
-      <translation>4. Zobrazování grafiky  </translation>
+        <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>
+        <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>
+        <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>
+        <source>7. CF Card Performance  </source>
+        <translation>7. Rychlost CF karty  </translation>
     </message>
     <message>
-      <source>&amp;Start Tests!</source>
-      <translation>&amp;Start Testů!</translation>
+        <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>
+        <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>
+        <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>
+        <source>error</source>
+        <translation>chyba</translation>
     </message>
     <message>
-      <source>Compare:</source>
-      <translation>Porovnat:</translation>
+        <source>Compare:</source>
+        <translation type="obsolete">Porovnat:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>FileSysInfo</name>
     <message>
-      <source>CF</source>
-      <translation>CF</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>SC</source>
+        <translation>SC</translation>
     </message>
     <message>
-      <source>In</source>
-      <translation>In</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
-      <source>Application CPU usage (%)</source>
-      <translation>Zatížení CPU aplikacemi (%)</translation>
+        <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>
+        <source>System CPU usage (%)</source>
+        <translation>Zatížení CPU systémem (%)</translation>
     </message>
     <message>
-      <source>This page shows how much this device's processor is being used.</source>
-      <translation>Tato stránka ukazuje vytížení procesoru zařízení.</translation>
+        <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>
+        <source>Type: </source>
+        <translation>Typ:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MemoryInfo</name>
     <message>
-      <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-      <translation>Tato stránka ukazuje, kolik RAM paměti je alokováno.
+        <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.
@@ -152,211 +151,219 @@ Pamět je rozdělena do těchto kategorií:
 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>
+        <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>
+        <source>Used (%1 kB)</source>
+        <translation>Použitá (%1 kB)</translation>
     </message>
     <message>
-      <source>Buffers (%1 kB)</source>
-      <translation>Buffery (%1 kB)</translation>
+        <source>Buffers (%1 kB)</source>
+        <translation>Buffery (%1 kB)</translation>
     </message>
     <message>
-      <source>Cached (%1 kB)</source>
-      <translation>Cache (%1 kB)</translation>
+        <source>Cached (%1 kB)</source>
+        <translation>Cache (%1 kB)</translation>
     </message>
     <message>
-      <source>Free (%1 kB)</source>
-      <translation>Volná (%1 kB)</translation>
+        <source>Free (%1 kB)</source>
+        <translation>Volná (%1 kB)</translation>
     </message>
     <message>
-      <source>Total Swap: %1 kB</source>
-      <translation>Celkový swap: %1 kB</translation>
+        <source>Total Swap: %1 kB</source>
+        <translation>Celkový swap: %1 kB</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ModulesInfo</name>
     <message>
-      <source>Module</source>
-      <translation>Modul</translation>
+        <source>Module</source>
+        <translation>Modul</translation>
     </message>
     <message>
-      <source>Size</source>
-      <translation>Velikost</translation>
+        <source>Size</source>
+        <translation>Velikost</translation>
     </message>
     <message>
-      <source>Use#</source>
-      <translation>Použití#</translation>
+        <source>Use#</source>
+        <translation>Použití#</translation>
     </message>
     <message>
-      <source>Used by</source>
-      <translation>Používá</translation>
+        <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.
+        <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.
+        <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>
+        <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>
+        <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>
+        <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>
+        <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
+        <source>You really want to execute
 %1 for this module?</source>
-      <translation>Opravdu chcete spustit 
+        <translation>Opravdu chcete spustit 
 %1 na tento modul?</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MountInfo</name>
     <message>
-      <source> : %1 kB</source>
-      <translation>: %1 kB</translation>
+        <source> : %1 kB</source>
+        <translation>: %1 kB</translation>
     </message>
     <message>
-      <source>Used (%1 kB)</source>
-      <translation>Použito (%1 kB)</translation>
+        <source>Used (%1 kB)</source>
+        <translation>Použito (%1 kB)</translation>
     </message>
     <message>
-      <source>Available (%1 kB)</source>
-      <translation>Volno (%1 kB)</translation>
+        <source>Available (%1 kB)</source>
+        <translation>Volno (%1 kB)</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
-      <source>PID</source>
-      <translation>PID</translation>
+        <source>PID</source>
+        <translation>PID</translation>
     </message>
     <message>
-      <source>Command</source>
-      <translation>Příkaz</translation>
+        <source>Command</source>
+        <translation>Příkaz</translation>
     </message>
     <message>
-      <source>Status</source>
-      <translation>Stav</translation>
+        <source>Status</source>
+        <translation>Stav</translation>
     </message>
     <message>
-      <source>Time</source>
-      <translation>Čas</translation>
+        <source>Time</source>
+        <translation>Čas</translation>
     </message>
     <message>
-      <source>This is a list of all the processes on this handheld device.
+        <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í.
+        <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>
+        <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>
+        <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>
+        <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>
+        <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
+        <source>Really want to send %1
 to this process?</source>
-      <translation>Opravdu chcete poslat %1
+        <translation>Opravdu chcete poslat %1
 tomuto procesu?</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SystemInfo</name>
     <message>
-      <source>System Info</source>
-      <translation>Informace o systému</translation>
+        <source>System Info</source>
+        <translation>Informace o systému</translation>
     </message>
     <message>
-      <source>Memory</source>
-      <translation>Paměť</translation>
+        <source>Memory</source>
+        <translation>Paměť</translation>
     </message>
     <message>
-      <source>Storage</source>
-      <translation>Úložný prostor</translation>
+        <source>Storage</source>
+        <translation>Úložný prostor</translation>
     </message>
     <message>
-      <source>CPU</source>
-      <translation>CPU</translation>
+        <source>CPU</source>
+        <translation>CPU</translation>
     </message>
     <message>
-      <source>Process</source>
-      <translation>Proces</translation>
+        <source>Process</source>
+        <translation>Proces</translation>
     </message>
     <message>
-      <source>Modules</source>
-      <translation>Moduly</translation>
+        <source>Modules</source>
+        <translation>Moduly</translation>
     </message>
     <message>
-      <source>Version</source>
-      <translation>Verze</translation>
+        <source>Version</source>
+        <translation>Verze</translation>
     </message>
     <message>
-      <source>Benchmark</source>
-      <translation>Výkonnostní testy</translation>
+        <source>Benchmark</source>
+        <translation>Výkonnostní testy</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>VersionInfo</name>
     <message>
-      <source>&lt;b>Linux Kernel&lt;/b>&lt;p>Version: </source>
-      <translation>&lt;b>Linux Kernel&lt;/b>&lt;p>Verze: </translation>
+        <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>Compiled by: </source>
-      <translation>Kompiloval: </translation>
+        <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
+        <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Verze: </translation>
     </message>
     <message>
-      <source>&lt;b>Opie&lt;/b>&lt;p>Version: </source>
-      <translation>&lt;b>Opie&lt;/b>&lt;p>Verze: </translation>
+        <source>Built on: </source>
+        <translation>Sestaveno: </translation>
     </message>
     <message>
-      <source>Built on: </source>
-      <translation>Sestaveno: </translation>
+        <source>&lt;p&gt;Version: </source>
+        <translation>&lt;p&gt;Verze: </translation>
     </message>
     <message>
-      <source>&lt;p>Version: </source>
-      <translation>&lt;p>Verze: </translation>
+        <source>&lt;br&gt;Model: </source>
+        <translation>&lt;br&gt;Model: </translation>
     </message>
     <message>
-      <source>&lt;br>Model: </source>
-      <translation>&lt;br>Model: </translation>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation>&lt;br&gt;Dodavatel: </translation>
     </message>
     <message>
-      <source>&lt;br>Vendor: </source>
-      <translation>&lt;br>Dodavatel: </translation>
+        <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>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>
+        <source>Built against Qt/E </source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/tableviewer.ts b/i18n/cz/tableviewer.ts
index 3075016..2e129de 100644
--- a/i18n/cz/tableviewer.ts
+++ b/i18n/cz/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Nelze vytvořit výchozí hodnotu pro typ %1, klíč nepřidán.</translation>
+        <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>DataElem::setField(%1, %2) Nebyl nalezen platný typ</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) Nebyl nalezen platný typ</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/cz/textedit.ts b/i18n/cz/textedit.ts
index c6d8ecb..7501d1d 100644
--- a/i18n/cz/textedit.ts
+++ b/i18n/cz/textedit.ts
@@ -200,6 +200,10 @@ Chcete je uložit?</translation>
         <source>Not enough lines</source>
         <translation>Nedostatek řádek</translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/cz/today.ts b/i18n/cz/today.ts
index deff10d..9265d98 100644
--- a/i18n/cz/today.ts
+++ b/i18n/cz/today.ts
@@ -15,12 +15,24 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Nejsou žádné pluginy</translation>
+        <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 type="unfinished">Today</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>
diff --git a/i18n/cz/todolist.ts b/i18n/cz/todolist.ts
index 8bf963a..7883cd6 100644
--- a/i18n/cz/todolist.ts
+++ b/i18n/cz/todolist.ts
@@ -9,6 +9,29 @@
         <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">Nezařazené</translation>
+    </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Nový úkol</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>
@@ -34,10 +57,21 @@
     </message>
 </context>
 <context>
+    <name>Opie</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Seznam Todo</translation>
+    </message>
+    <message>
+        <source>Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Opie Todolist</source>
-        <translation>Opie Todolist</translation>
+        <translation type="obsolete">Opie Todolist</translation>
     </message>
     <message>
         <source>Enter Task</source>
@@ -60,39 +94,39 @@
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Nový ze šablony</translation>
+        <translation type="obsolete">Nový ze šablony</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nový úkol</translation>
+        <translation type="obsolete">Nový úkol</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Klikněte sem pro vytvoření nového úkolu.</translation>
+        <translation type="obsolete">Klikněte sem pro vytvoření nového úkolu.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Upravit úkol</translation>
+        <translation type="obsolete">Upravit úkol</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Klikněte sem pro změnu aktuálního úkolu.</translation>
+        <translation type="obsolete">Klikněte sem pro změnu aktuálního úkolu.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Zobrazit úkol</translation>
+        <translation type="obsolete">Zobrazit úkol</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Smazat...</translation>
+        <translation type="obsolete">Smazat...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Klikněte sem pro odstranění aktuálního úkolu.</translation>
+        <translation type="obsolete">Klikněte sem pro odstranění aktuálního úkolu.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Smazat vše...</translation>
+        <translation type="obsolete">Smazat vše...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,19 +134,19 @@
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplikovat</translation>
+        <translation type="obsolete">Duplikovat</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Odeslat</translation>
+        <translation type="obsolete">Odeslat</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Klikněte sem pro odeslání aktuálního úkolu jinému zařízení.</translation>
+        <translation type="obsolete">Klikněte sem pro odeslání aktuálního úkolu jinému zařízení.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Hledat</translation>
+        <translation type="obsolete">Hledat</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -132,15 +166,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Možnosti</translation>
+        <translation type="obsolete">Možnosti</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -164,11 +198,11 @@ Seznam zobrazuje následující informace:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Všechny kategorie</translation>
+        <translation type="obsolete">Všechny kategorie</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Nezařazené</translation>
+        <translation type="obsolete">Nezařazené</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -234,7 +268,7 @@ Přesto skončit?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Konfigurovat šablony</translation>
+        <translation type="obsolete">Konfigurovat šablony</translation>
     </message>
     <message>
         <source>Template Editor</source>
diff --git a/i18n/cz/wellenreiter.ts b/i18n/cz/wellenreiter.ts
index 5d706d7..468e3c8 100644
--- a/i18n/cz/wellenreiter.ts
+++ b/i18n/cz/wellenreiter.ts
@@ -1,787 +1,798 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>MScanListView</name>
     <message>
-      <source>Net/Station</source>
-      <translation>Síť/Stanice</translation>
+        <source>Net/Station</source>
+        <translation>Síť/Stanice</translation>
     </message>
     <message>
-      <source>#</source>
-      <translation>#</translation>
+        <source>#</source>
+        <translation>#</translation>
     </message>
     <message>
-      <source>MAC</source>
-      <translation>MAC</translation>
+        <source>MAC</source>
+        <translation>MAC</translation>
     </message>
     <message>
-      <source>Chn</source>
-      <translation>Kan.</translation>
+        <source>Chn</source>
+        <translation>Kan.</translation>
     </message>
     <message>
-      <source>W</source>
-      <translation>W</translation>
+        <source>W</source>
+        <translation>W</translation>
     </message>
     <message>
-      <source>T</source>
-      <translation>T</translation>
+        <source>T</source>
+        <translation>T</translation>
     </message>
     <message>
-      <source>IP</source>
-      <translation>IP</translation>
+        <source>IP</source>
+        <translation>IP</translation>
     </message>
     <message>
-      <source>Manufacturer</source>
-      <translation>Výrobce</translation>
+        <source>Manufacturer</source>
+        <translation>Výrobce</translation>
     </message>
     <message>
-      <source>First Seen</source>
-      <translation>Prvně viděná</translation>
+        <source>First Seen</source>
+        <translation>Prvně viděná</translation>
     </message>
     <message>
-      <source>Last Seen</source>
-      <translation>Naposled viděná</translation>
+        <source>Last Seen</source>
+        <translation>Naposled viděná</translation>
     </message>
     <message>
-      <source>Location</source>
-      <translation>Umístění</translation>
+        <source>Location</source>
+        <translation>Umístění</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>MStatWindow</name>
     <message>
-      <source>Protocol</source>
-      <translation>Protokol</translation>
+        <source>Protocol</source>
+        <translation>Protokol</translation>
     </message>
     <message>
-      <source>Count</source>
-      <translation>Počet</translation>
+        <source>Count</source>
+        <translation>Počet</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ProtocolListView</name>
     <message>
-      <source>Protocol Family</source>
-      <translation>Rodina protokolů</translation>
+        <source>Protocol Family</source>
+        <translation>Rodina protokolů</translation>
     </message>
     <message>
-      <source>Perform Action</source>
-      <translation>Provést akci</translation>
+        <source>Perform Action</source>
+        <translation>Provést akci</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>QObject</name>
     <message>
-      <source>Wellenreiter: trying to run as non-root!</source>
-      <translation>Wellenreiter: pokus o spuštění jako ne-root!</translation>
+        <source>Wellenreiter: trying to run as non-root!</source>
+        <translation>Wellenreiter: pokus o spuštění jako ne-root!</translation>
     </message>
     <message>
-      <source>You have started Wellenreiter II
+        <source>You have started Wellenreiter II
 as non-root. You will have
 only limited functionality.
 Proceed anyway?</source>
-      <translation>Spustili jste Wellenreiter II
+        <translation>Spustili jste Wellenreiter II
 ne jako root. Budete mít jen
 omezenou funkcionalitu.
 Přesto pokračovat?</translation>
     </message>
     <message>
-      <source>You have a dhcp client running.
+        <source>You have a dhcp client running.
 (PID = %1)
 This can severly limit scanning!
 Should I kill it for you?</source>
-      <translation>Máte spuštěný dhcp klient.
+        <translation>Máte spuštěný dhcp klient.
 (PID = %1)
 To může výrazně omezit skenování! 
 Mám ho pro vás zabít?</translation>
     </message>
     <message>
-      <source>Restart your dhcp client?</source>
-      <translation>Restartovat váš dhcp klient?</translation>
+        <source>Restart your dhcp client?</source>
+        <translation>Restartovat váš dhcp klient?</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Wellenreiter</name>
     <message>
-      <source>Your wireless card
+        <source>Your wireless card
 should now be usable again.</source>
-      <translation>Vaše bezdrátová karta by
+        <translation>Vaše bezdrátová karta by
 měla být nyní znovu použitelná.</translation>
     </message>
     <message>
-      <source>No device configured.
+        <source>No device configured.
 Please reconfigure!</source>
-      <translation>Nebylo nakonfigurováno žádné zařízení. 
+        <translation>Nebylo nakonfigurováno žádné zařízení. 
 Prosím rekonfigurujte!</translation>
     </message>
     <message>
-      <source>The configured device (%1)
+        <source>The configured device (%1)
 is not available on this system
 . Please reconfigure!</source>
-      <translation>Konfigurované zařízení (%1)
+        <translation>Konfigurované zařízení (%1)
 není k dispozici na tomtoí systému.
 Prosím rekonfigurujte!</translation>
     </message>
     <message>
-      <source>Can't bring interface '%1' up:
+        <source>Can&apos;t bring interface &apos;%1&apos; up:
 </source>
-      <translation>Nelze nahodit rozhraní '%1' :</translation>
+        <translation>Nelze nahodit rozhraní &apos;%1&apos; :</translation>
     </message>
     <message>
-      <source>&lt;p>The Wireless Extension Versions&lt;br>are not matching!&lt;p>  Wellenreiter II : WE V%1&lt;br>Interface driver: WE V%2</source>
-      <translation>&lt;p>Verze bezdrátových rozšíření&lt;br>nesouhlasí!&lt;p>  Wellenreiter II : WE V%1&lt;br>Ovladač rozhraní: WE V%2</translation>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="obsolete">&lt;p&gt;Verze bezdrátových rozšíření&lt;br&gt;nesouhlasí!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Ovladač rozhraní: WE V%2</translation>
     </message>
     <message>
-      <source>Bring your device into
+        <source>Bring your device into
 monitor mode now.</source>
-      <translation>Přepínám vaše zařízení 
+        <translation>Přepínám vaše zařízení 
 do sledovacího režimu.</translation>
     </message>
     <message>
-      <source>Can't set interface '%1'
+        <source>Can&apos;t set interface &apos;%1&apos;
 into monitor mode:
 </source>
-      <translation>Zařízení '%1' nelze přepnout
+        <translation>Zařízení &apos;%1&apos; nelze přepnout
 do sledovacího režimu.</translation>
     </message>
     <message>
-      <source>
+        <source>
 Continue with limited functionality?</source>
-      <translation>
+        <translation>
 Pokračovat s omezenou funkčností?</translation>
     </message>
     <message>
-      <source>Can't open packet capturer for
-'%1':
+        <source>Can&apos;t open packet capturer for
+&apos;%1&apos;:
 </source>
-      <translation>Nelze otevřít zachytávač paketů pro
-'%1':</translation>
+        <translation>Nelze otevřít zachytávač paketů pro
+&apos;%1&apos;:</translation>
     </message>
     <message>
-      <source>Wellenreiter II - replaying capture file...</source>
-      <translation>Wellenreiter II - přehrávám zachycený soubor...</translation>
+        <source>Wellenreiter II - replaying capture file...</source>
+        <translation>Wellenreiter II - přehrávám zachycený soubor...</translation>
     </message>
     <message>
-      <source>Got packet with protocol '%1'</source>
-      <comment>Protocol Name</comment>
-      <translation>Chycen paket s protokolem '%1'</translation>
+        <source>Got packet with protocol &apos;%1&apos;</source>
+        <comment>Protocol Name</comment>
+        <translation>Chycen paket s protokolem &apos;%1&apos;</translation>
     </message>
     <message>
-      <source>Can't do that!</source>
-      <translation>To nelze provést!</translation>
+        <source>Can&apos;t do that!</source>
+        <translation>To nelze provést!</translation>
     </message>
     <message>
-      <source>No wireless
+        <source>No wireless
 interface available.</source>
-      <translation>Bezdrátové rozhraní
+        <translation>Bezdrátové rozhraní
 není k dispozici.</translation>
     </message>
     <message>
-      <source>Stop sniffing before
+        <source>Stop sniffing before
 joining a net.</source>
-      <translation>Vypněte zachytávání před
+        <translation>Vypněte zachytávání před
 připojením k síti.</translation>
     </message>
     <message>
-      <source>Function only available on Embedded build</source>
-      <translation>Funkce je k dispozici pouze v Embedded kompilaci</translation>
+        <source>Function only available on Embedded build</source>
+        <translation>Funkce je k dispozici pouze v Embedded kompilaci</translation>
     </message>
-  </context>
-  <context>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WellenreiterBase</name>
     <message>
-      <source>Wellenreiter/Opie</source>
-      <translation>Wellenreiter/Opie</translation>
+        <source>Wellenreiter/Opie</source>
+        <translation>Wellenreiter/Opie</translation>
     </message>
     <message>
-      <source>Wellenreiter/X11</source>
-      <translation>Wellenreiter/X11</translation>
+        <source>Wellenreiter/X11</source>
+        <translation>Wellenreiter/X11</translation>
     </message>
     <message>
-      <source>Nets</source>
-      <translation>Sítě</translation>
+        <source>Nets</source>
+        <translation>Sítě</translation>
     </message>
     <message>
-      <source>Graph</source>
-      <translation>Graf</translation>
+        <source>Graph</source>
+        <translation>Graf</translation>
     </message>
     <message>
-      <source>Log</source>
-      <translation>Log</translation>
+        <source>Log</source>
+        <translation>Log</translation>
     </message>
     <message>
-      <source>Hex</source>
-      <translation>Hex</translation>
+        <source>Hex</source>
+        <translation>Hex</translation>
     </message>
     <message>
-      <source>Stat</source>
-      <translation>Stat</translation>
+        <source>Stat</source>
+        <translation>Stat</translation>
     </message>
     <message>
-      <source>About</source>
-      <translation>O aplikaci</translation>
+        <source>About</source>
+        <translation>O aplikaci</translation>
     </message>
     <message>
-      <source>Networks</source>
-      <translation>Sítě</translation>
+        <source>Networks</source>
+        <translation>Sítě</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>WellenreiterConfigBase</name>
     <message>
-      <source>Wellenreiter II COnfiguration Dialog</source>
-      <translation>Wellenreiter II konfigurační okno</translation>
+        <source>Wellenreiter II COnfiguration Dialog</source>
+        <translation type="obsolete">Wellenreiter II konfigurační okno</translation>
+    </message>
+    <message>
+        <source>Interface</source>
+        <translation>Rozhraní</translation>
+    </message>
+    <message>
+        <source>&lt;select&gt;</source>
+        <translation>&lt;vyber&gt;</translation>
     </message>
     <message>
-      <source>Interface</source>
-      <translation>Rozhraní</translation>
+        <source>cisco</source>
+        <translation>cisco</translation>
     </message>
     <message>
-      <source>&lt;select></source>
-      <translation>&lt;vyber></translation>
+        <source>wlan-ng</source>
+        <translation>wlan-ng</translation>
     </message>
     <message>
-      <source>cisco</source>
-      <translation>cisco</translation>
+        <source>hostap</source>
+        <translation>hostap</translation>
     </message>
     <message>
-      <source>wlan-ng</source>
-      <translation>wlan-ng</translation>
+        <source>orinoco</source>
+        <translation>orinoco</translation>
     </message>
     <message>
-      <source>hostap</source>
-      <translation>hostap</translation>
+        <source>&lt;manual&gt;</source>
+        <translation>&lt;manuální&gt;</translation>
     </message>
     <message>
-      <source>orinoco</source>
-      <translation>orinoco</translation>
+        <source>&lt;file&gt;</source>
+        <translation>&lt;soubor&gt;</translation>
     </message>
     <message>
-      <source>&lt;manual></source>
-      <translation>&lt;manuální></translation>
+        <source>Choose the type of driver used for sniffing.</source>
+        <translation>Vyberte typ ovladače použitý pro zachytávání.</translation>
     </message>
     <message>
-      <source>&lt;file></source>
-      <translation>&lt;soubor></translation>
+        <source>Driver:</source>
+        <translation>Ovladač:</translation>
     </message>
     <message>
-      <source>Choose the type of driver used for sniffing.</source>
-      <translation>Vyberte typ ovladače použitý pro zachytávání.</translation>
+        <source>Choose the interface used for sniffing.</source>
+        <translation>Vyberte rozhraní použité pro zachytávání.</translation>
     </message>
     <message>
-      <source>Driver:</source>
-      <translation>Ovladač:</translation>
+        <source>Name:</source>
+        <translation>Jméno:</translation>
     </message>
     <message>
-      <source>Choose the interface used for sniffing.</source>
-      <translation>Vyberte rozhraní použité pro zachytávání.</translation>
+        <source>Perform Autodetection</source>
+        <translation>Provést autodetekci</translation>
     </message>
     <message>
-      <source>Name:</source>
-      <translation>Jméno:</translation>
+        <source>Retrigger the autodetection algorithm</source>
+        <translation>Znovu pustit autedekční algoritmus</translation>
     </message>
     <message>
-      <source>Perform Autodetection</source>
-      <translation>Provést autodetekci</translation>
+        <source>Use additional PRISM header</source>
+        <translation>Použít přídavnou PRISM hlavičku</translation>
     </message>
     <message>
-      <source>Retrigger the autodetection algorithm</source>
-      <translation>Znovu pustit autedekční algoritmus</translation>
+        <source>Use additional PRISM headers, if available.</source>
+        <translation>Použít přídavnou PRISM hlavičku, pokud je k dispozici.</translation>
     </message>
     <message>
-      <source>Use additional PRISM header</source>
-      <translation>Použít přídavnou PRISM hlavičku</translation>
+        <source>Hop Channels</source>
+        <translation>Přeskakovat po kanálech</translation>
     </message>
     <message>
-      <source>Use additional PRISM headers, if available.</source>
-      <translation>Použít přídavnou PRISM hlavičku, pokud je k dispozici.</translation>
+        <source>Check this, if you want to start a channel hopper.</source>
+        <translation>Zaškrtněte, pokud chcete spustit skákání po kanálech.</translation>
     </message>
     <message>
-      <source>Hop Channels</source>
-      <translation>Přeskakovat po kanálech</translation>
+        <source>every</source>
+        <translation>každých</translation>
     </message>
     <message>
-      <source>Check this, if you want to start a channel hopper.</source>
-      <translation>Zaškrtněte, pokud chcete spustit skákání po kanálech.</translation>
+        <source> ms</source>
+        <translation> ms</translation>
     </message>
     <message>
-      <source>every</source>
-      <translation>každých</translation>
+        <source>Choose the channel hop interval.</source>
+        <translation>Vyberte interval skoku po kanálech.</translation>
     </message>
     <message>
-      <source> ms</source>
-      <translation> ms</translation>
+        <source>Use Adaptive(TM) Hop Scheme</source>
+        <translation>Použít adaptivní(TM) skákací předpis</translation>
     </message>
     <message>
-      <source>Choose the channel hop interval.</source>
-      <translation>Vyberte interval skoku po kanálech.</translation>
+        <source>An adaptive hopping interval dynamically changes the channel hopping parameters to listen longer on channels where traffic comes in.</source>
+        <translation>Adaptivní skákací interval dynamicky mění parametry skoku pro delší poslech kanálů, kde běží provoz.</translation>
     </message>
     <message>
-      <source>Use Adaptive(TM) Hop Scheme</source>
-      <translation>Použít adaptivní(TM) skákací předpis</translation>
+        <source>Scan on channel</source>
+        <translation>Skenovat na kanále</translation>
     </message>
     <message>
-      <source>An adaptive hopping interval dynamically changes the channel hopping parameters to listen longer on channels where traffic comes in.</source>
-      <translation>Adaptivní skákací interval dynamicky mění parametry skoku pro delší poslech kanálů, kde běží provoz.</translation>
+        <source>Check the channels which should be included in the channel hopping scheme. Note that due to the 802.11 channel overlay scheme you may receive data on neighbour channels of channels, even if they&apos;re not checked here.</source>
+        <translation>Vyberte kanály, které mají být součástí předpisu skákání po kanálech. Z důvodu překryvu 802.11 kanálů můžete přijmout data na sousedních kanálech, i když nebudou zaškrtnuty.</translation>
     </message>
     <message>
-      <source>Scan on channel</source>
-      <translation>Skenovat na kanále</translation>
+        <source>6</source>
+        <translation>6</translation>
     </message>
     <message>
-      <source>Check the channels which should be included in the channel hopping scheme. Note that due to the 802.11 channel overlay scheme you may receive data on neighbour channels of channels, even if they're not checked here.</source>
-      <translation>Vyberte kanály, které mají být součástí předpisu skákání po kanálech. Z důvodu překryvu 802.11 kanálů můžete přijmout data na sousedních kanálech, i když nebudou zaškrtnuty.</translation>
+        <source>8</source>
+        <translation>8</translation>
     </message>
     <message>
-      <source>6</source>
-      <translation>6</translation>
+        <source>2</source>
+        <translation>2</translation>
     </message>
     <message>
-      <source>8</source>
-      <translation>8</translation>
+        <source>9</source>
+        <translation>9</translation>
     </message>
     <message>
-      <source>2</source>
-      <translation>2</translation>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
-      <source>9</source>
-      <translation>9</translation>
+        <source>All</source>
+        <translation>Všechny</translation>
     </message>
     <message>
-      <source>1</source>
-      <translation>1</translation>
+        <source>11</source>
+        <translation>11</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Všechny</translation>
+        <source>10</source>
+        <translation>10</translation>
     </message>
     <message>
-      <source>11</source>
-      <translation>11</translation>
+        <source>7</source>
+        <translation>7</translation>
     </message>
     <message>
-      <source>10</source>
-      <translation>10</translation>
+        <source>3</source>
+        <translation>3</translation>
     </message>
     <message>
-      <source>7</source>
-      <translation>7</translation>
+        <source>5</source>
+        <translation>5</translation>
     </message>
     <message>
-      <source>3</source>
-      <translation>3</translation>
+        <source>4</source>
+        <translation>4</translation>
     </message>
     <message>
-      <source>5</source>
-      <translation>5</translation>
+        <source>12</source>
+        <translation>12</translation>
     </message>
     <message>
-      <source>4</source>
-      <translation>4</translation>
+        <source>13</source>
+        <translation>13</translation>
     </message>
     <message>
-      <source>12</source>
-      <translation>12</translation>
+        <source>14</source>
+        <translation>14</translation>
     </message>
     <message>
-      <source>13</source>
-      <translation>13</translation>
+        <source>Capture</source>
+        <translation>Zachytávat</translation>
     </message>
     <message>
-      <source>14</source>
-      <translation>14</translation>
+        <source>Browse</source>
+        <translation>Prohlížet</translation>
     </message>
     <message>
-      <source>Capture</source>
-      <translation>Zachytávat</translation>
+        <source>Click to open a file requester to choose a capture file name.</source>
+        <translation>Klikněte pro výběr jména souboru pro zachytávání.</translation>
     </message>
     <message>
-      <source>Browse</source>
-      <translation>Prohlížet</translation>
+        <source>Write Capture Files To</source>
+        <translation>Zapsat zachytávací soubory do</translation>
     </message>
     <message>
-      <source>Click to open a file requester to choose a capture file name.</source>
-      <translation>Klikněte pro výběr jména souboru pro zachytávání.</translation>
+        <source>Check this to write an ethereal compatible capture file.</source>
+        <translation>Zaškrtněte pro zápis souboru kompatibilního s Etherealem.</translation>
     </message>
     <message>
-      <source>Write Capture Files To</source>
-      <translation>Zapsat zachytávací soubory do</translation>
+        <source>/tmp/capture</source>
+        <translation>/tmp/capture</translation>
     </message>
     <message>
-      <source>Check this to write an ethereal compatible capture file.</source>
-      <translation>Zaškrtněte pro zápis souboru kompatibilního s Etherealem.</translation>
+        <source>Configure the name of the capture file.</source>
+        <translation>Konfigurovat jméno zachytávacího souboru.</translation>
     </message>
     <message>
-      <source>/tmp/capture</source>
-      <translation>/tmp/capture</translation>
+        <source>Hex View Buffer</source>
+        <translation>Zásobník Hex zobrazení</translation>
     </message>
     <message>
-      <source>Configure the name of the capture file.</source>
-      <translation>Konfigurovat jméno zachytávacího souboru.</translation>
+        <source>unlimited</source>
+        <translation>neomezený</translation>
     </message>
     <message>
-      <source>Hex View Buffer</source>
-      <translation>Zásobník Hex zobrazení</translation>
+        <source>limited to</source>
+        <translation>omezený na</translation>
     </message>
     <message>
-      <source>unlimited</source>
-      <translation>neomezený</translation>
+        <source> Packets</source>
+        <translation>Paketů</translation>
     </message>
     <message>
-      <source>limited to</source>
-      <translation>omezený na</translation>
+        <source>Parse</source>
+        <translation>Analyzovat</translation>
     </message>
     <message>
-      <source> Packets</source>
-      <translation>Paketů</translation>
+        <source>UI</source>
+        <translation>UI</translation>
     </message>
     <message>
-      <source>Parse</source>
-      <translation>Analyzovat</translation>
+        <source>Lookup MAC vendor names</source>
+        <translation>Hledání v tabulce držitelů MAC adres</translation>
     </message>
     <message>
-      <source>UI</source>
-      <translation>UI</translation>
+        <source>Check this to lookup MAC vendor names.</source>
+        <translation>Zaškrtněte pro hledání jména držitele MAC adres.</translation>
     </message>
     <message>
-      <source>Lookup MAC vendor names</source>
-      <translation>Hledání v tabulce držitelů MAC adres</translation>
+        <source>Open Tree On New Station</source>
+        <translation>Otevřít strom na novou stanici</translation>
     </message>
     <message>
-      <source>Check this to lookup MAC vendor names.</source>
-      <translation>Zaškrtněte pro hledání jména držitele MAC adres.</translation>
+        <source>Check this to automatically make a tree visible when a new station is detected.</source>
+        <translation>Zaškrtněte pro automatické vytvoření stromu při nalezení nové stanice.</translation>
     </message>
     <message>
-      <source>Open Tree On New Station</source>
-      <translation>Otevřít strom na novou stanici</translation>
+        <source>Disable Power Management</source>
+        <translation>Vypnout správu energie</translation>
     </message>
     <message>
-      <source>Check this to automatically make a tree visible when a new station is detected.</source>
-      <translation>Zaškrtněte pro automatické vytvoření stromu při nalezení nové stanice.</translation>
+        <source>Check this to disable power management while scanning.</source>
+        <translation>Zaškrtněte pro vypnutí správy energie během skenování.</translation>
     </message>
     <message>
-      <source>Disable Power Management</source>
-      <translation>Vypnout správu energie</translation>
+        <source>Action on detecting a new</source>
+        <translation>Akce při detekci nové</translation>
     </message>
     <message>
-      <source>Check this to disable power management while scanning.</source>
-      <translation>Zaškrtněte pro vypnutí správy energie během skenování.</translation>
+        <source>Wired Station:</source>
+        <translation>Stanice:</translation>
     </message>
     <message>
-      <source>Action on detecting a new</source>
-      <translation>Akce při detekci nové</translation>
+        <source>Network:</source>
+        <translation>Sítě:</translation>
     </message>
     <message>
-      <source>Wired Station:</source>
-      <translation>Stanice:</translation>
+        <source>&lt;Ignore&gt;</source>
+        <translation>&lt;Ignorovat&gt;</translation>
     </message>
     <message>
-      <source>Network:</source>
-      <translation>Sítě:</translation>
+        <source>Play Alarm</source>
+        <translation>Přehrát alarm</translation>
     </message>
     <message>
-      <source>&lt;Ignore></source>
-      <translation>&lt;Ignorovat></translation>
+        <source>Play Click</source>
+        <translation>Přehrát kliknutí</translation>
     </message>
     <message>
-      <source>Play Alarm</source>
-      <translation>Přehrát alarm</translation>
+        <source>Blink LED</source>
+        <translation>Bliknout LED</translation>
     </message>
     <message>
-      <source>Play Click</source>
-      <translation>Přehrát kliknutí</translation>
+        <source>Run Script</source>
+        <translation>Spustit skript</translation>
     </message>
     <message>
-      <source>Blink LED</source>
-      <translation>Bliknout LED</translation>
+        <source>Choose an action to perform when a new wireless station is detected.</source>
+        <translation>Vyberte akci, která se provede po nalezení nové bezdrátové stanice.</translation>
     </message>
     <message>
-      <source>Run Script</source>
-      <translation>Spustit skript</translation>
+        <source>The command line to execute when a script action is performed.</source>
+        <translation>Příkazový řádek pro spuštění při provádění skriptu.</translation>
     </message>
     <message>
-      <source>Choose an action to perform when a new wireless station is detected.</source>
-      <translation>Vyberte akci, která se provede po nalezení nové bezdrátové stanice.</translation>
+        <source>Wireless Station:</source>
+        <translation>Bezdrátová stanice:</translation>
     </message>
     <message>
-      <source>The command line to execute when a script action is performed.</source>
-      <translation>Příkazový řádek pro spuštění při provádění skriptu.</translation>
+        <source>Choose the action to perform when a new wired station is detected.</source>
+        <translation>Vyberte akci, která se provede při nalezení nové připojené stanice.</translation>
     </message>
     <message>
-      <source>Wireless Station:</source>
-      <translation>Bezdrátová stanice:</translation>
+        <source>Choose an action to perform when a new network is detected.</source>
+        <translation>Vyberte akci, která se provede při nalezení nové sítě.</translation>
     </message>
     <message>
-      <source>Choose the action to perform when a new wired station is detected.</source>
-      <translation>Vyberte akci, která se provede při nalezení nové připojené stanice.</translation>
+        <source>Intrusion</source>
+        <translation>Průnik</translation>
     </message>
     <message>
-      <source>Choose an action to perform when a new network is detected.</source>
-      <translation>Vyberte akci, která se provede při nalezení nové sítě.</translation>
+        <source>Link Level</source>
+        <translation>Úroveň signálu</translation>
     </message>
     <message>
-      <source>Intrusion</source>
-      <translation>Průnik</translation>
+        <source>Fake Mac:</source>
+        <translation>Podvržená Mac:</translation>
     </message>
     <message>
-      <source>Link Level</source>
-      <translation>Úroveň signálu</translation>
+        <source>Send proble requests</source>
+        <translation type="obsolete">Provádět sondování</translation>
     </message>
     <message>
-      <source>Fake Mac:</source>
-      <translation>Podvržená Mac:</translation>
+        <source>&lt;automatic&gt;</source>
+        <translation>&lt;automaticky&gt;</translation>
     </message>
     <message>
-      <source>Send proble requests</source>
-      <translation>Provádět sondování</translation>
+        <source>44:44:44:44:44:44</source>
+        <translation>44:44:44:44:44:44</translation>
     </message>
     <message>
-      <source>&lt;automatic></source>
-      <translation>&lt;automaticky></translation>
+        <source>Try to authenticate</source>
+        <translation>Pokus o přihlášení</translation>
     </message>
     <message>
-      <source>44:44:44:44:44:44</source>
-      <translation>44:44:44:44:44:44</translation>
+        <source>Enable active scanning</source>
+        <translation>Aktivovat aktivní skenování</translation>
     </message>
     <message>
-      <source>Try to authenticate</source>
-      <translation>Pokus o přihlášení</translation>
+        <source>IP Level</source>
+        <translation>IP úroveň</translation>
     </message>
     <message>
-      <source>Enable active scanning</source>
-      <translation>Aktivovat aktivní skenování</translation>
+        <source>Request DHCP Address</source>
+        <translation>Vyžádat DHCP adresu</translation>
     </message>
     <message>
-      <source>IP Level</source>
-      <translation>IP úroveň</translation>
+        <source>Fake IP:</source>
+        <translation>Podvrhnout IP:</translation>
     </message>
     <message>
-      <source>Request DHCP Address</source>
-      <translation>Vyžádat DHCP adresu</translation>
+        <source>192.168.125.1</source>
+        <translation>192.168.125.1</translation>
     </message>
     <message>
-      <source>Fake IP:</source>
-      <translation>Podvrhnout IP:</translation>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-      <source>192.168.125.1</source>
-      <translation>192.168.125.1</translation>
+        <source>Enable GPS logging w/ gpsd</source>
+        <translation>Zapnout GPS logování s gpsd</translation>
     </message>
     <message>
-      <source>GPS</source>
-      <translation>GPS</translation>
+        <source>Check this to log GPS coordinates.</source>
+        <translation>Zaškrtněte pro logování GPS pozice.</translation>
     </message>
     <message>
-      <source>Enable GPS logging w/ gpsd</source>
-      <translation>Zapnout GPS logování s gpsd</translation>
+        <source>Host</source>
+        <translation>Hostitel</translation>
     </message>
     <message>
-      <source>Check this to log GPS coordinates.</source>
-      <translation>Zaškrtněte pro logování GPS pozice.</translation>
+        <source>localhost</source>
+        <translation>localhost</translation>
     </message>
     <message>
-      <source>Host</source>
-      <translation>Hostitel</translation>
+        <source>Hostadress where the gps daemon listens on.</source>
+        <translation>Adresa hostitele, kde poslouchá gps démon.</translation>
     </message>
     <message>
-      <source>localhost</source>
-      <translation>localhost</translation>
+        <source>:</source>
+        <translation>:</translation>
     </message>
     <message>
-      <source>Hostadress where the gps daemon listens on.</source>
-      <translation>Adresa hostitele, kde poslouchá gps démon.</translation>
+        <source>Port number where the gps daemon listens on.</source>
+        <translation>Číslo portu, na kterém naslouchá gps démon.</translation>
     </message>
     <message>
-      <source>:</source>
-      <translation>:</translation>
+        <source>Start gpsd on localhost</source>
+        <translation>Spustit gpsd na localhostu</translation>
     </message>
     <message>
-      <source>Port number where the gps daemon listens on.</source>
-      <translation>Číslo portu, na kterém naslouchá gps démon.</translation>
+        <source>Check to start the GPS daemon on localhost.</source>
+        <translation>Zaškrtněte pro spuštění GPS démona na lokální stanici.</translation>
     </message>
     <message>
-      <source>Start gpsd on localhost</source>
-      <translation>Spustit gpsd na localhostu</translation>
+        <source>gpsd -p /dev/ttyS3 -s 4800</source>
+        <translation>gpsd -p /dev/ttyS3 -s 4800</translation>
     </message>
     <message>
-      <source>Check to start the GPS daemon on localhost.</source>
-      <translation>Zaškrtněte pro spuštění GPS démona na lokální stanici.</translation>
+        <source>Command line to start the gps daemon.</source>
+        <translation>Příkaz pro spuštění gps démona.</translation>
     </message>
     <message>
-      <source>gpsd -p /dev/ttyS3 -s 4800</source>
-      <translation>gpsd -p /dev/ttyS3 -s 4800</translation>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-      <source>Command line to start the gps daemon.</source>
-      <translation>Příkaz pro spuštění gps démona.</translation>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>WellenreiterMainWindow</name>
     <message>
-      <source>Click here to start scanning.</source>
-      <translation>Zde klikněte pro spuštění skenování.</translation>
+        <source>Click here to start scanning.</source>
+        <translation>Zde klikněte pro spuštění skenování.</translation>
     </message>
     <message>
-      <source>Click here to stop scanning.</source>
-      <translation>Zde klikněte pro zastavení skenování.</translation>
+        <source>Click here to stop scanning.</source>
+        <translation>Zde klikněte pro zastavení skenování.</translation>
     </message>
     <message>
-      <source>Click here to open the configure dialog.</source>
-      <translation>Zde klikněte pro konfigurační okno.</translation>
+        <source>Click here to open the configure dialog.</source>
+        <translation>Zde klikněte pro konfigurační okno.</translation>
     </message>
     <message>
-      <source>Click here to upload a capture session.</source>
-      <translation>Klikněte pro odeslání zachycené relace.</translation>
+        <source>Click here to upload a capture session.</source>
+        <translation>Klikněte pro odeslání zachycené relace.</translation>
     </message>
     <message>
-      <source>&amp;Session...</source>
-      <translation>&amp;Relace...</translation>
+        <source>&amp;Session...</source>
+        <translation>&amp;Relace...</translation>
     </message>
     <message>
-      <source>&amp;Text Log...</source>
-      <translation>&amp;Textový Log...</translation>
+        <source>&amp;Text Log...</source>
+        <translation>&amp;Textový Log...</translation>
     </message>
     <message>
-      <source>&amp;Hex Log...</source>
-      <translation>&amp;Hexa Log...</translation>
+        <source>&amp;Hex Log...</source>
+        <translation>&amp;Hexa Log...</translation>
     </message>
     <message>
-      <source>&amp;New</source>
-      <translation>&amp;Nový</translation>
+        <source>&amp;New</source>
+        <translation>&amp;Nový</translation>
     </message>
     <message>
-      <source>&amp;Load</source>
-      <translation>&amp;Otevřít</translation>
+        <source>&amp;Load</source>
+        <translation>&amp;Otevřít</translation>
     </message>
     <message>
-      <source>&amp;Save</source>
-      <translation>&amp;Uložit</translation>
+        <source>&amp;Save</source>
+        <translation>&amp;Uložit</translation>
     </message>
     <message>
-      <source>&amp;Upload Session</source>
-      <translation>&amp;Odeslat relaci</translation>
+        <source>&amp;Upload Session</source>
+        <translation>&amp;Odeslat relaci</translation>
     </message>
     <message>
-      <source>&amp;Exit</source>
-      <translation>&amp;Exit</translation>
+        <source>&amp;Exit</source>
+        <translation>&amp;Exit</translation>
     </message>
     <message>
-      <source>&amp;Configure...</source>
-      <translation>&amp;Konfigurovat...</translation>
+        <source>&amp;Configure...</source>
+        <translation>&amp;Konfigurovat...</translation>
     </message>
     <message>
-      <source>&amp;Start</source>
-      <translation>&amp;Start</translation>
+        <source>&amp;Start</source>
+        <translation>&amp;Start</translation>
     </message>
     <message>
-      <source>Sto&amp;p</source>
-      <translation>Sto&amp;p</translation>
+        <source>Sto&amp;p</source>
+        <translation>Sto&amp;p</translation>
     </message>
     <message>
-      <source>&amp;Expand All</source>
-      <translation>&amp;Rozvinout vše</translation>
+        <source>&amp;Expand All</source>
+        <translation>&amp;Rozvinout vše</translation>
     </message>
     <message>
-      <source>&amp;Collapse All</source>
-      <translation>&amp;Schovat vše</translation>
+        <source>&amp;Collapse All</source>
+        <translation>&amp;Schovat vše</translation>
     </message>
     <message>
-      <source>&amp;Add something</source>
-      <translation>&amp;Něco přidat</translation>
+        <source>&amp;Add something</source>
+        <translation>&amp;Něco přidat</translation>
     </message>
     <message>
-      <source>&amp;File</source>
-      <translation>&amp;Soubor</translation>
+        <source>&amp;File</source>
+        <translation>&amp;Soubor</translation>
     </message>
     <message>
-      <source>&amp;View</source>
-      <translation>&amp;Zobrazit</translation>
+        <source>&amp;View</source>
+        <translation>&amp;Zobrazit</translation>
     </message>
     <message>
-      <source>&amp;Sniffer</source>
-      <translation>&amp;Zachytávač</translation>
+        <source>&amp;Sniffer</source>
+        <translation>&amp;Zachytávač</translation>
     </message>
     <message>
-      <source>&amp;Demo</source>
-      <translation>&amp;Demo</translation>
+        <source>&amp;Demo</source>
+        <translation>&amp;Demo</translation>
     </message>
     <message>
-      <source>Ready.</source>
-      <translation>Připraven.</translation>
+        <source>Ready.</source>
+        <translation>Připraven.</translation>
     </message>
     <message>
-      <source>Configure</source>
-      <translation>Konfigurovat</translation>
+        <source>Configure</source>
+        <translation>Konfigurovat</translation>
     </message>
     <message>
-      <source>GPS said:
+        <source>GPS said:
 %1</source>
-      <translation>GPS říká:
+        <translation>GPS říká:
 %1</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Vše</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Sniffing in progress!
+        <source>Sniffing in progress!
 Please stop sniffing before closing.</source>
-      <translation>Běží zachytávání! 
+        <translation>Běží zachytávání! 
 Před zavřením ho prosím vypněte.</translation>
     </message>
     <message>
-      <source>Upload Session</source>
-      <translation>Odeslat relaci</translation>
+        <source>Upload Session</source>
+        <translation>Odeslat relaci</translation>
     </message>
     <message>
-      <source>From: </source>
-      <translation>Od: </translation>
+        <source>From: </source>
+        <translation>Od: </translation>
     </message>
     <message>
-      <source>Location: </source>
-      <translation>Lokalita: </translation>
+        <source>Location: </source>
+        <translation>Lokalita: </translation>
     </message>
     <message>
-      <source>Comments: </source>
-      <translation>Komentář: </translation>
+        <source>Comments: </source>
+        <translation>Komentář: </translation>
     </message>
     <message>
-      <source>&amp;Ok</source>
-      <translation>&amp;Ok</translation>
+        <source>&amp;Ok</source>
+        <translation>&amp;Ok</translation>
     </message>
     <message>
-      <source>&amp;Cancel</source>
-      <translation>&amp;Storno</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
     </message>
     <message>
-      <source>Error</source>
-      <translation>Chyba</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-      <source>&lt;p>Logfile '%1' doesn't exist&lt;/p></source>
-      <translation>&lt;p>Log soubor '%1' neexistuje&lt;/p></translation>
+        <source>&lt;p&gt;Logfile &apos;%1&apos; doesn&apos;t exist&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Log soubor &apos;%1&apos; neexistuje&lt;/p&gt;</translation>
     </message>
     <message>
-      <source>&lt;p>Can't open Logfile '%1'&lt;/p></source>
-      <translation>&lt;p>Nelze otevřít log soubor '%1'&lt;/p></translation>
+        <source>&lt;p&gt;Can&apos;t open Logfile &apos;%1&apos;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Nelze otevřít log soubor &apos;%1&apos;&lt;/p&gt;</translation>
     </message>
     <message>
-      <source>Success</source>
-      <translation>Úspěch</translation>
+        <source>Success</source>
+        <translation>Úspěch</translation>
     </message>
     <message>
-      <source>Capture Dump was uploaded to %1</source>
-      <translation>Zachycený výpis byl odeslán na %1</translation>
+        <source>Capture Dump was uploaded to %1</source>
+        <translation>Zachycený výpis byl odeslán na %1</translation>
     </message>
     <message>
-      <source>Connection to %1 failed</source>
-      <translation>Připojení k %1 se nezdařilo</translation>
+        <source>Connection to %1 failed</source>
+        <translation>Připojení k %1 se nezdařilo</translation>
     </message>
-  </context>
+</context>
 </TS>
diff --git a/i18n/cz/zlines.ts b/i18n/cz/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/cz/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/cz/zsafe.ts b/i18n/cz/zsafe.ts
index de635bc..63133f5 100644
--- a/i18n/cz/zsafe.ts
+++ b/i18n/cz/zsafe.ts
@@ -1,610 +1,643 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
+<!DOCTYPE TS><TS>
+<context>
     <name>CategoryDialog</name>
     <message>
-      <source>Category</source>
-      <translation>Kategorie</translation>
+        <source>Category</source>
+        <translation>Kategorie</translation>
     </message>
     <message>
-      <source>Icon</source>
-      <translation>Ikona</translation>
+        <source>Icon</source>
+        <translation>Ikona</translation>
     </message>
     <message>
-      <source>Field 1</source>
-      <translation>Pole 1</translation>
+        <source>Field 1</source>
+        <translation>Pole 1</translation>
     </message>
     <message>
-      <source>Field 2</source>
-      <translation>Pole 2</translation>
+        <source>Field 2</source>
+        <translation>Pole 2</translation>
     </message>
     <message>
-      <source>Field 3</source>
-      <translation>Pole 3</translation>
+        <source>Field 3</source>
+        <translation>Pole 3</translation>
     </message>
     <message>
-      <source>Field 4</source>
-      <translation>Pole 4</translation>
+        <source>Field 4</source>
+        <translation>Pole 4</translation>
     </message>
     <message>
-      <source>Field 5</source>
-      <translation>Pole 5</translation>
+        <source>Field 5</source>
+        <translation>Pole 5</translation>
     </message>
     <message>
-      <source>Field 6</source>
-      <translation>Pole 6</translation>
+        <source>Field 6</source>
+        <translation>Pole 6</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>InfoForm</name>
     <message>
-      <source>Information:</source>
-      <translation>Informace:</translation>
+        <source>Information:</source>
+        <translation>Informace:</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>NewDialog</name>
     <message>
-      <source>New Entry</source>
-      <translation>Nová položka</translation>
+        <source>New Entry</source>
+        <translation>Nová položka</translation>
     </message>
     <message>
-      <source>Comment</source>
-      <translation>Komentář</translation>
+        <source>Comment</source>
+        <translation>Komentář</translation>
     </message>
     <message>
-      <source>Field 6</source>
-      <translation>Pole 6</translation>
+        <source>Field 6</source>
+        <translation>Pole 6</translation>
     </message>
     <message>
-      <source>Field 5</source>
-      <translation>Pole 5</translation>
+        <source>Field 5</source>
+        <translation>Pole 5</translation>
     </message>
     <message>
-      <source>Password</source>
-      <translation>Heslo</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
     <message>
-      <source>Username</source>
-      <translation>Uživatelské jméno</translation>
+        <source>Username</source>
+        <translation>Uživatelské jméno</translation>
     </message>
     <message>
-      <source>Name</source>
-      <translation>Název</translation>
+        <source>Name</source>
+        <translation>Název</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>PasswordForm</name>
     <message>
-      <source>ZSafe</source>
-      <translation>ZSafe</translation>
+        <source>ZSafe</source>
+        <translation>ZSafe</translation>
     </message>
     <message>
-      <source>Password</source>
-      <translation>Heslo</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ScQtFileDlg</name>
     <message>
-      <source>FileDlg</source>
-      <translation>Soubor</translation>
+        <source>FileDlg</source>
+        <translation>Soubor</translation>
     </message>
     <message>
-      <source>file type filter</source>
-      <translation>Filtr typu souborů</translation>
+        <source>file type filter</source>
+        <translation>Filtr typu souborů</translation>
     </message>
     <message>
-      <source>ComboBox FileTypeFilter
+        <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
-      <translation>Rámeček filtru typu souborů
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>CancelButton</source>
+        <translation>Tlačítko Storno</translation>
     </message>
     <message>
-      <source>shows the selected filename</source>
-      <translation>Zobrazí vybraný název souboru</translation>
+        <source>shows the selected filename</source>
+        <translation>Zobrazí vybraný název souboru</translation>
     </message>
     <message>
-      <source>Filename LineEdit
+        <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
-      <translation>Řádka s názvem souboru
+        <translation>Řádka s názvem souboru
 
 zobrazí vybraný soubor
 a umožní přímou úpravu názvu
 souboru</translation>
     </message>
     <message>
-      <source>ComboBox Directory 
+        <source>ComboBox Directory 
 edit or select the directories name</source>
-      <translation>Rámeček adresář
+        <translation>Rámeček adresář
 úprava, nebo výběr názvu adresáře</translation>
     </message>
     <message>
-      <source>Name</source>
-      <translation>Jméno</translation>
+        <source>Name</source>
+        <translation>Jméno</translation>
     </message>
     <message>
-      <source>size</source>
-      <translation>velikost</translation>
+        <source>size</source>
+        <translation>velikost</translation>
     </message>
     <message>
-      <source>type</source>
-      <translation>typ</translation>
+        <source>type</source>
+        <translation>typ</translation>
     </message>
     <message>
-      <source>directory listview</source>
-      <translation>seznam adresářů</translation>
+        <source>directory listview</source>
+        <translation>seznam adresářů</translation>
     </message>
     <message>
-      <source>Directory ListView
+        <source>Directory ListView
 
 shows the list of dirs and files</source>
-      <translation>Seznam Adresářů
+        <translation>Seznam Adresářů
 
 zobrazí seznam adresářů a souborů</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation></translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ScQtFileEditDlg</name>
     <message>
-      <source>dir</source>
-      <translation>adresář</translation>
+        <source>dir</source>
+        <translation>adresář</translation>
     </message>
     <message>
-      <source>file</source>
-      <translation>soubor</translation>
+        <source>file</source>
+        <translation>soubor</translation>
     </message>
     <message>
-      <source>link</source>
-      <translation>link</translation>
+        <source>link</source>
+        <translation>link</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>SearchDialog</name>
     <message>
-      <source>Search</source>
-      <translation>Hledat</translation>
+        <source>Search</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Username</source>
-      <translation>Uživatelské jméno</translation>
+        <source>Username</source>
+        <translation>Uživatelské jméno</translation>
     </message>
     <message>
-      <source>Name</source>
-      <translation>Název</translation>
+        <source>Name</source>
+        <translation>Název</translation>
     </message>
     <message>
-      <source>Comment</source>
-      <translation>Komentář</translation>
+        <source>Comment</source>
+        <translation>Komentář</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>Wait</name>
     <message>
-      <source>Please Wait...</source>
-      <translation>Prosím čekejte...</translation>
+        <source>Please Wait...</source>
+        <translation>Prosím čekejte...</translation>
     </message>
-  </context>
-  <context>
+</context>
+<context>
     <name>ZSafe</name>
     <message>
-      <source>ZSafe</source>
-      <translation>ZSafe</translation>
+        <source>ZSafe</source>
+        <translation>ZSafe</translation>
     </message>
     <message>
-      <source>Can't create directory
+        <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
-      <translation>Nelze vytvořit adresář
+        <translation type="obsolete">Nelze vytvořit adresář
 .../Documents/application
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
-      <source>Can't create directory
+        <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
-      <translation>Nelze vytvořit adresář
+        <translation type="obsolete">Nelze vytvořit adresář
 %1
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
-      <source>Can't create directory
+        <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
-      <translation>Nelze vytvořit adresář
+        <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>
+        <source>&amp;New document</source>
+        <translation>&amp;Nový dokument</translation>
     </message>
     <message>
-      <source>&amp;Open document</source>
-      <translation>&amp;Otevřít dokument</translation>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <source>E&amp;xit</source>
+        <translation>K&amp;onec</translation>
     </message>
     <message>
-      <source>&amp;File</source>
-      <translation>&amp;Soubor</translation>
+        <source>&amp;File</source>
+        <translation>&amp;Soubor</translation>
     </message>
     <message>
-      <source>&amp;New</source>
-      <translation>&amp;Nový</translation>
+        <source>&amp;New</source>
+        <translation>&amp;Nový</translation>
     </message>
     <message>
-      <source>&amp;Edit</source>
-      <translation>&amp;Upravit</translation>
+        <source>&amp;Edit</source>
+        <translation>&amp;Upravit</translation>
     </message>
     <message>
-      <source>&amp;Delete</source>
-      <translation>&amp;Smazat</translation>
+        <source>&amp;Delete</source>
+        <translation>&amp;Smazat</translation>
     </message>
     <message>
-      <source>&amp;Category</source>
-      <translation>&amp;Kategorie</translation>
+        <source>&amp;Category</source>
+        <translation>&amp;Kategorie</translation>
     </message>
     <message>
-      <source>&amp;Cut</source>
-      <translation>&amp;Vyjmout</translation>
+        <source>&amp;Cut</source>
+        <translation>&amp;Vyjmout</translation>
     </message>
     <message>
-      <source>C&amp;opy</source>
-      <translation>K&amp;opírovat</translation>
+        <source>C&amp;opy</source>
+        <translation>K&amp;opírovat</translation>
     </message>
     <message>
-      <source>&amp;Paste</source>
-      <translation>&amp;Vložit</translation>
+        <source>&amp;Paste</source>
+        <translation>&amp;Vložit</translation>
     </message>
     <message>
-      <source>&amp;Search</source>
-      <translation>&amp;Hledat</translation>
+        <source>&amp;Search</source>
+        <translation>&amp;Hledat</translation>
     </message>
     <message>
-      <source>&amp;Entry</source>
-      <translation>&amp;Položka</translation>
+        <source>&amp;Entry</source>
+        <translation>&amp;Položka</translation>
     </message>
     <message>
-      <source>&amp;About</source>
-      <translation>&amp;O aplikaci</translation>
+        <source>&amp;About</source>
+        <translation>&amp;O aplikaci</translation>
     </message>
     <message>
-      <source>&amp;Help</source>
-      <translation>&amp;Nápověda</translation>
+        <source>&amp;Help</source>
+        <translation>&amp;Nápověda</translation>
     </message>
     <message>
-      <source>New entry</source>
-      <translation>Nová položka</translation>
+        <source>New entry</source>
+        <translation>Nová položka</translation>
     </message>
     <message>
-      <source>Edit category or entry</source>
-      <translation>Upravit kategorii, nebo položku</translation>
+        <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>
+        <source>Delete category or entry</source>
+        <translation>Smazat kategorii, nebo položku</translation>
     </message>
     <message>
-      <source>Find entry</source>
-      <translation>Hledat položku</translation>
+        <source>Find entry</source>
+        <translation>Hledat položku</translation>
     </message>
     <message>
-      <source>Name</source>
-      <translation>Název</translation>
+        <source>Name</source>
+        <translation>Název</translation>
     </message>
     <message>
-      <source>Field 2</source>
-      <translation>Pole 2</translation>
+        <source>Field 2</source>
+        <translation>Pole 2</translation>
     </message>
     <message>
-      <source>Field 3</source>
-      <translation>Pole 3</translation>
+        <source>Field 3</source>
+        <translation>Pole 3</translation>
     </message>
     <message>
-      <source>Comment</source>
-      <translation>Komentář</translation>
+        <source>Comment</source>
+        <translation>Komentář</translation>
     </message>
     <message>
-      <source>Field 4</source>
-      <translation>Pole 4</translation>
+        <source>Field 4</source>
+        <translation>Pole 4</translation>
     </message>
     <message>
-      <source>Field 5</source>
-      <translation>Pole 5</translation>
+        <source>Field 5</source>
+        <translation>Pole 5</translation>
     </message>
     <message>
-      <source></source>
-      <translation>
-</translation>
+        <source></source>
+        <translation></translation>
     </message>
     <message>
-      <source>Do you want to delete?</source>
-      <translation>Opravdu chcete smazat?</translation>
+        <source>Do you want to delete?</source>
+        <translation>Opravdu chcete smazat?</translation>
     </message>
     <message>
-      <source>D&amp;on't Delete</source>
-      <translation>N&amp;emazat</translation>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation>N&amp;emazat</translation>
     </message>
     <message>
-      <source>Edit Entry</source>
-      <translation>Upravit položku</translation>
+        <source>Edit Entry</source>
+        <translation type="obsolete">Upravit položku</translation>
     </message>
     <message>
-      <source>Username</source>
-      <translation>Uživatelské jméno</translation>
+        <source>Username</source>
+        <translation>Uživatelské jméno</translation>
     </message>
     <message>
-      <source>Password</source>
-      <translation>Heslo</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
     <message>
-      <source>New Entry</source>
-      <translation>Nová položka</translation>
+        <source>New Entry</source>
+        <translation type="obsolete">Nová položka</translation>
     </message>
     <message>
-      <source>Entry name must be different
+        <source>Entry name must be different
 from the category name.</source>
-      <translation>Název položky musí být jiný
+        <translation>Název položky musí být jiný
 než název kategorie.</translation>
     </message>
     <message>
-      <source>Search</source>
-      <translation>Hledat</translation>
+        <source>Search</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-      <source>Entry not found</source>
-      <translation>Položka nenalezena</translation>
+        <source>Entry not found</source>
+        <translation>Položka nenalezena</translation>
     </message>
     <message>
-      <source>&amp;OK</source>
-      <translation>&amp;OK</translation>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
     </message>
     <message>
-      <source>All</source>
-      <translation>Všechno</translation>
+        <source>All</source>
+        <translation>Všechno</translation>
     </message>
     <message>
-      <source>Text</source>
-      <translation>Text</translation>
+        <source>Text</source>
+        <translation>Text</translation>
     </message>
     <message>
-      <source>Remove text file</source>
-      <translation>Odstranit textový soubor</translation>
+        <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>
+        <source>Could not remove text file.</source>
+        <translation>Nelze odstranit textový soubor.</translation>
     </message>
     <message>
-      <source>No document defined.
+        <source>No document defined.
 You have to create a new document</source>
-      <translation>Dokument nebyl definován.
+        <translation>Dokument nebyl definován.
 Vytvořte nový dokument</translation>
     </message>
     <message>
-      <source>Export text file</source>
-      <translation>Export do textového souboru</translation>
+        <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>
+        <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>
+        <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>
+        <source>Could not import text file.</source>
+        <translation>Nelze importovat textový soubor.</translation>
     </message>
     <message>
-      <source>Enter Password</source>
-      <translation>Zadejte heslo</translation>
+        <source>Enter Password</source>
+        <translation>Zadejte heslo</translation>
     </message>
     <message>
-      <source>Wrong password.
+        <source>Wrong password.
 
 ZSafe will now exit.</source>
-      <translation>Špatné heslo.
+        <translation>Špatné heslo.
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
-      <source>Wrong password.
+        <source>Wrong password.
 Enter again?</source>
-      <translation>Špatné heslo.
+        <translation>Špatné heslo.
 Zkusit znovu?</translation>
     </message>
     <message>
-      <source>&amp;Yes</source>
-      <translation>&amp;Ano</translation>
+        <source>&amp;Yes</source>
+        <translation>&amp;Ano</translation>
     </message>
     <message>
-      <source>&amp;No.</source>
-      <translation>&amp;Ne.</translation>
+        <source>&amp;No.</source>
+        <translation>&amp;Ne.</translation>
     </message>
     <message>
-      <source>Empty document or
+        <source>Empty document or
 wrong password.
 Continue?</source>
-      <translation>Prázdný dokument,
+        <translation>Prázdný dokument,
 nebo špatné heslo.
 Pokračovat?</translation>
     </message>
     <message>
-      <source>&amp;No</source>
-      <translation>&amp;Ne</translation>
+        <source>&amp;No</source>
+        <translation>&amp;Ne</translation>
     </message>
     <message>
-      <source>&amp;Yes.</source>
-      <translation>&amp;Ano.</translation>
+        <source>&amp;Yes.</source>
+        <translation>&amp;Ano.</translation>
     </message>
     <message>
-      <source>Password is empty.
+        <source>Password is empty.
 Please enter again.</source>
-      <translation>Heslo je prázdné.
+        <translation>Heslo je prázdné.
 Zadejte ho znovu.</translation>
     </message>
     <message>
-      <source>Reenter Password</source>
-      <translation>Opakujte heslo</translation>
+        <source>Reenter Password</source>
+        <translation>Opakujte heslo</translation>
     </message>
     <message>
-      <source>Passwords must be identical.
+        <source>Passwords must be identical.
 Please enter again.</source>
-      <translation>Hesla musí být identická.
+        <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>
+        <source>Do you want to save </source>
+        <translation>Chcete uložit změny</translation>
     </message>
     <message>
-      <source>
+        <source>
 before continuing?</source>
-      <translation>
+        <translation>
 před pokračováním?</translation>
     </message>
     <message>
-      <source>&amp;Save</source>
-      <translation>&amp;Uložit</translation>
+        <source>&amp;Save</source>
+        <translation>&amp;Uložit</translation>
     </message>
     <message>
-      <source>&amp;Don't Save</source>
-      <translation>&amp;Neukládat</translation>
+        <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>
+        <source>Password file saved.</source>
+        <translation>Soubor s hesly uložen.</translation>
     </message>
     <message>
-      <source>Do you want to save
+        <source>Do you want to save
 before exiting?</source>
-      <translation>Chcete uložit změny
+        <translation>Chcete uložit změny
 před ukončením?</translation>
     </message>
     <message>
-      <source>S&amp;ave with
+        <source>S&amp;ave with
 new
 password</source>
-      <translation>U&amp;ložit s
+        <translation>U&amp;ložit s
 novým
 heslem</translation>
     </message>
     <message>
-      <source>Category</source>
-      <translation>Kategorie</translation>
+        <source>Category</source>
+        <translation>Kategorie</translation>
     </message>
     <message>
-      <source>Wait dialog</source>
-      <translation>Čekejte</translation>
+        <source>Wait dialog</source>
+        <translation>Čekejte</translation>
     </message>
     <message>
-      <source>Gathering icons...</source>
-      <translation>Shromažďování ikon...</translation>
+        <source>Gathering icons...</source>
+        <translation>Shromažďování ikon...</translation>
     </message>
     <message>
-      <source>Create new ZSafe document</source>
-      <translation>Vytvořit nový ZSafe dokument</translation>
+        <source>Create new ZSafe document</source>
+        <translation type="obsolete">Vytvořit nový ZSafe dokument</translation>
     </message>
     <message>
-      <source>Now you have to enter
+        <source>Now you have to enter
 a password twice for your
 newly created document.</source>
-      <translation>Nyní prosím zadejte
+        <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>
+        <source>Open ZSafe document</source>
+        <translation>Otevřít ZSafe dokument</translation>
     </message>
     <message>
-      <source>Save ZSafe document as..</source>
-      <translation>Uložit ZSafe dokument jako..</translation>
+        <source>Save ZSafe document as..</source>
+        <translation type="obsolete">Uložit ZSafe dokument jako..</translation>
     </message>
     <message>
-      <source>Zaurus Password Manager&lt;br></source>
-      <translation>Zaurus Správce hesel&lt;br></translation>
+        <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></source>
-      <translation>ZSafe verze 2.1.2-jv01b&lt;br></translation>
+        <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></source>
-      <translation>napsal Carsten Schneider&lt;br></translation>
+        <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></source>
-      <translation>Přeložil Robert Ernst&lt;br></translation>
+        <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></source>
-      <translation>ZSafe verze 2.1.2&lt;br></translation>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="obsolete">ZSafe verze 2.1.2&lt;br&gt;</translation>
     </message>
-  </context>
+    <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/cz/zsame.ts b/i18n/cz/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/cz/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/advancedfm.ts b/i18n/da/advancedfm.ts
index 4637f94..3be2637 100644
--- a/i18n/da/advancedfm.ts
+++ b/i18n/da/advancedfm.ts
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Mappen eksisterer ikke</translation>
+        <translation type="obsolete">Mappen eksisterer ikke</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
@@ -124,7 +124,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Vil du slette
+        <translation type="obsolete">Vil du slette
 %1 filer?</translation>
     </message>
     <message>
@@ -146,7 +146,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Vil du kopiere
+        <translation type="obsolete">Vil du kopiere
 %1 filer?</translation>
     </message>
     <message>
@@ -156,19 +156,19 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 eksisterer. Overskriv?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>Kunne ikke kopiere
+        <translation type="obsolete">Kunne ikke kopiere
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>til
+        <translation type="obsolete">til
 </translation>
     </message>
     <message>
@@ -182,7 +182,7 @@ eksisterer. Overskriv?</translation>
     <message>
         <source>Could not move
 </source>
-        <translation>Kunne ikke flytte
+        <translation type="obsolete">Kunne ikke flytte
 </translation>
     </message>
     <message>
@@ -204,23 +204,23 @@ eksisterer. Overskriv?</translation>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation> eksisterer allerede.
+        <translation type="obsolete"> eksisterer allerede.
 Vil du slette den?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 eksisterer. Overskriv?</translation>
+        <translation type="obsolete">%1 eksisterer. Overskriv?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Kunne ikke kopiere %1 til %2</translation>
+        <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>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 er copyright 2002-2003 af
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 og er licenseret som GPL</translation>
@@ -241,7 +241,7 @@ og er licenseret som GPL</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Kan ikke fjerne den aktuelle mappe
+        <translation type="obsolete">Kan ikke fjerne den aktuelle mappe
 fra bogmærker.
 Den er ikke bogmærket!</translation>
     </message>
@@ -252,13 +252,13 @@ Den er ikke bogmærket!</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Vil du slette %1
+        <translation type="obsolete">Vil du slette %1
 og alt hvad der er i den?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Vil du slette
+        <translation type="obsolete">Vil du slette
 %1?</translation>
     </message>
     <message>
@@ -282,10 +282,67 @@ og alt hvad der er i den?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
+        <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>
diff --git a/i18n/da/backup.ts b/i18n/da/backup.ts
index 8d96122..c0b867c 100644
--- a/i18n/da/backup.ts
+++ b/i18n/da/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Sikkerhedskopiering... arbejder...</translation>
+        <translation type="obsolete">Sikkerhedskopiering... arbejder...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -58,6 +58,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -75,7 +83,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Gem som</translation>
+        <translation type="obsolete">Gem som</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -121,6 +129,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/da/bartender.ts b/i18n/da/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/da/bartender.ts
+++ b/i18n/da/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/da/bluetooth-manager.ts b/i18n/da/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/da/bluetooth-manager.ts
+++ b/i18n/da/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/da/dagger.ts b/i18n/da/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/da/dagger.ts
+++ b/i18n/da/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/da/launchersettings.ts b/i18n/da/launchersettings.ts
index cd3c8f6..6d18117 100644
--- a/i18n/da/launchersettings.ts
+++ b/i18n/da/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/da/libGPRS.ts b/i18n/da/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/da/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libaboutapplet.ts b/i18n/da/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/da/libaboutapplet.ts
+++ b/i18n/da/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/da/libbatteryapplet.ts b/i18n/da/libbatteryapplet.ts
index 97df939..c240e44 100644
--- a/i18n/da/libbatteryapplet.ts
+++ b/i18n/da/libbatteryapplet.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Procent batteri tilbage</translation>
+        <translation type="obsolete">Procent batteri tilbage</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Batteri tid tilbage</translation>
+        <translation type="obsolete">Batteri tid tilbage</translation>
     </message>
     <message>
         <source>Battery status</source>
@@ -71,11 +71,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Procent strøm tilbage:</translation>
+        <translation type="obsolete">Procent strøm tilbage:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Tid tilbage på batteriet:</translation>
+        <translation type="obsolete">Tid tilbage på batteriet:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -86,11 +86,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/da/libbluetooth.ts b/i18n/da/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/da/libbluetooth.ts
+++ b/i18n/da/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/libbrightnessapplet.ts b/i18n/da/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libcable.ts b/i18n/da/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/da/libcable.ts
+++ b/i18n/da/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/libcardmonapplet.ts b/i18n/da/libcardmonapplet.ts
index 399a7f4..d550ec2 100644
--- a/i18n/da/libcardmonapplet.ts
+++ b/i18n/da/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation>Skubbet ud: </translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/libexample_applet.ts b/i18n/da/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/da/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libexample_board.ts b/i18n/da/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/da/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libexample_vpn.ts b/i18n/da/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/da/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libinterfaces.ts b/i18n/da/libinterfaces.ts
index e543638..e49ee76 100644
--- a/i18n/da/libinterfaces.ts
+++ b/i18n/da/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/da/libkppp.ts b/i18n/da/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/da/libkppp.ts
+++ b/i18n/da/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/da/liblancard.ts b/i18n/da/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/da/liblancard.ts
+++ b/i18n/da/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/liblockapplet.ts b/i18n/da/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/da/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libmailwrapper.ts b/i18n/da/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/da/libmailwrapper.ts
+++ b/i18n/da/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/da/libmemoryapplet.ts b/i18n/da/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/da/libmemoryapplet.ts
+++ b/i18n/da/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/da/libnetworksettings2.ts b/i18n/da/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/da/libnetworksettings2.ts
+++ b/i18n/da/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/libopiemm2.ts b/i18n/da/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/da/libopiemm2.ts
+++ b/i18n/da/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/libopiepim2.ts b/i18n/da/libopiepim2.ts
index 2abb23e..2211102 100644
--- a/i18n/da/libopiepim2.ts
+++ b/i18n/da/libopiepim2.ts
@@ -533,6 +533,109 @@ og</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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>Open</source>
@@ -968,6 +1071,34 @@ og</translation>
         <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>
diff --git a/i18n/da/libopiesecurity2.ts b/i18n/da/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/da/libopiesecurity2.ts
+++ b/i18n/da/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/libopietooth2.ts b/i18n/da/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/da/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libopietooth2applet.ts b/i18n/da/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/da/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libopieui2.ts b/i18n/da/libopieui2.ts
index 70eba6e..3057343 100644
--- a/i18n/da/libopieui2.ts
+++ b/i18n/da/libopieui2.ts
@@ -63,20 +63,12 @@
 <context>
     <name>OFileDialog</name>
     <message>
-        <source>FileDialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open</source>
-        <translation type="unfinished">Åbn</translation>
+        <translation type="obsolete">Åbn</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Gem</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Gem</translation>
     </message>
 </context>
 <context>
@@ -120,15 +112,11 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Stil</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Stil</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>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over Lazy Dog</translation>
     </message>
 </context>
 <context>
@@ -370,7 +358,7 @@ og</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Størelse</translation>
     </message>
     <message>
         <source>Date</source>
@@ -385,11 +373,19 @@ og</translation>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Åbn</translation>
+        <translation type="unfinished">Åbn</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Gem</translation>
+        <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>
@@ -403,15 +399,15 @@ og</translation>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Stil</translation>
+        <translation type="unfinished">Stil</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Størrelse</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">The Quick Brown Fox Jumps Over Lazy Dog</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/da/libphasestyle.ts b/i18n/da/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/da/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libppp.ts b/i18n/da/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/da/libppp.ts
+++ b/i18n/da/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/da/libprofile.ts b/i18n/da/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/da/libprofile.ts
+++ b/i18n/da/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/da/libqpickboard.ts b/i18n/da/libqpickboard.ts
index 198b7a6..6035e4e 100644
--- a/i18n/da/libqpickboard.ts
+++ b/i18n/da/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pegeplade</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/libscreenshotapplet.ts b/i18n/da/libscreenshotapplet.ts
index 15bd7b3..ded2f36 100644
--- a/i18n/da/libscreenshotapplet.ts
+++ b/i18n/da/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/libtodayaddressbookplugin.ts b/i18n/da/libtodayaddressbookplugin.ts
index 7ac6bea..d67c118 100644
--- a/i18n/da/libtodayaddressbookplugin.ts
+++ b/i18n/da/libtodayaddressbookplugin.ts
@@ -10,14 +10,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,10 +51,6 @@ Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/da/libtodayexampleplugin.ts b/i18n/da/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/da/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libtodayweatherplugin.ts b/i18n/da/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/da/libtodayweatherplugin.ts
+++ b/i18n/da/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/libvolumeapplet2.ts b/i18n/da/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libvpn.ts b/i18n/da/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/da/libvpn.ts
+++ b/i18n/da/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/libwebstyle.ts b/i18n/da/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/da/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libwlan.ts b/i18n/da/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/da/libwlan.ts
+++ b/i18n/da/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/da/main-tab.ts b/i18n/da/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/da/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/multiauth.ts b/i18n/da/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/networksettings2.ts b/i18n/da/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/da/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/opie-console.ts b/i18n/da/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/da/opie-console.ts
+++ b/i18n/da/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/da/opie-eye.ts b/i18n/da/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/da/opie-eye.ts
+++ b/i18n/da/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/opie-eye_slave.ts b/i18n/da/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/da/opie-eye_slave.ts
+++ b/i18n/da/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/opie-login.ts b/i18n/da/opie-login.ts
index 1aeda80..dbce466 100644
--- a/i18n/da/opie-login.ts
+++ b/i18n/da/opie-login.ts
@@ -9,7 +9,7 @@ for at kalibrere skærmen.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Velkommen til Opie</translation>
+        <translation type="obsolete">Velkommen til Opie</translation>
     </message>
 </context>
 <context>
@@ -76,8 +76,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/da/opie-sheet.ts b/i18n/da/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/da/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/opie-update-symlinks.ts b/i18n/da/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/opieirc.ts b/i18n/da/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/da/opieirc.ts
+++ b/i18n/da/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/da/opiemail.ts b/i18n/da/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/da/opiemail.ts
+++ b/i18n/da/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/da/opieplayer2.ts b/i18n/da/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/da/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/da/opierec.ts b/i18n/da/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/da/opierec.ts
+++ b/i18n/da/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/opimconverter.ts b/i18n/da/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/da/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/osearch.ts b/i18n/da/osearch.ts
index 17a4266..b35ce4d 100644
--- a/i18n/da/osearch.ts
+++ b/i18n/da/osearch.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Versalfølsom</translation>
+        <translation type="obsolete">Versalfølsom</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -65,6 +65,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -97,15 +101,15 @@
     </message>
     <message>
         <source>show completed tasks</source>
-        <translation>vis udførte opgaver</translation>
+        <translation type="obsolete">vis udførte opgaver</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>vis hændelser i fortiden</translation>
+        <translation type="obsolete">vis hændelser i fortiden</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>søg i datoer</translation>
+        <translation type="obsolete">søg i datoer</translation>
     </message>
     <message>
         <source>File: </source>
@@ -121,11 +125,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>søg indhold</translation>
+        <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 26d0a4b..fd5eb95 100644
--- a/i18n/da/oxygen.ts
+++ b/i18n/da/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>Grundstoffernes Komposition (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/da/oyatzee.ts b/i18n/da/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/da/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/packagemanager.ts b/i18n/da/packagemanager.ts
index 7fec62d..d8bb72e 100644
--- a/i18n/da/packagemanager.ts
+++ b/i18n/da/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -339,7 +379,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Klik her for at opdatere pakke lister fra serverne.</translation>
+        <translation type="obsolete">Klik her for at opdatere pakke lister fra serverne.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -347,7 +387,7 @@
     </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>
+        <translation type="obsolete">Klik her for at opgradere alle installerede pakker, hvis en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -355,7 +395,7 @@
     </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>
+        <translation type="obsolete">Klik her for at hente den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -363,7 +403,7 @@
     </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>
+        <translation type="obsolete">Klik her for at installere, fjerne eller opgradere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -375,7 +415,7 @@
     </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>
+        <translation type="obsolete">Klik her for at vise de tilgængelige pakker der ikke er installeret.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -383,7 +423,7 @@
     </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>
+        <translation type="obsolete">Klik her for at vise de pakker der er installeret på denne enhed.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -391,7 +431,7 @@
     </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>
+        <translation type="obsolete">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>
@@ -415,7 +455,7 @@
     </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>
+        <translation type="obsolete">Klik her for at søge efter tekst i pakke navnene.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -423,7 +463,7 @@
     </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>
+        <translation type="obsolete">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>
@@ -443,11 +483,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Klik her for at konfigurere dette program.</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Klik her for at skjule søge værktøjslinien.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -606,84 +646,140 @@ Er du sikker?
         <translation type="obsolete">Opdaterer Launcher...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -719,23 +815,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Server</translation>
+        <translation type="obsolete">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Navn:</translation>
+        <translation type="obsolete">Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Adresse:</translation>
+        <translation type="obsolete">Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Aktiv server</translation>
+        <translation type="obsolete">Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Opdater</translation>
+        <translation type="obsolete">Opdater</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -793,6 +889,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Meddelelser til fejlfinding</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Navn:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Placering:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Navn:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Adresse:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -825,6 +1063,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/da/powerchord.ts b/i18n/da/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/da/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/da/pyquicklauncher.ts b/i18n/da/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/qpe.ts b/i18n/da/qpe.ts
index de67e85..35a6e5d 100644
--- a/i18n/da/qpe.ts
+++ b/i18n/da/qpe.ts
@@ -388,6 +388,13 @@ Genoplad venligst back-up batteriet.</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>
@@ -407,6 +414,13 @@ Genoplad venligst back-up batteriet.</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>
diff --git a/i18n/da/security.ts b/i18n/da/security.ts
index ddbf92d..f565284 100644
--- a/i18n/da/security.ts
+++ b/i18n/da/security.ts
@@ -70,49 +70,37 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <source>Any</source>
+        <translation type="unfinished">Vilkårlig</translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
+        <source>None</source>
+        <translation type="unfinished">Ingen</translation>
     </message>
     <message>
-        <source>192.168.1.0/24</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>OK</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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -137,23 +125,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Testing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/sfcave-sdl.ts b/i18n/da/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/sfcave.ts b/i18n/da/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/da/sfcave.ts
+++ b/i18n/da/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/simple-icon.ts b/i18n/da/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/da/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/simple-main.ts b/i18n/da/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/da/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/simple-pim.ts b/i18n/da/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/da/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/simple.ts b/i18n/da/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/da/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/stocktickertest.ts b/i18n/da/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/da/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/sysinfo.ts b/i18n/da/sysinfo.ts
index 8a82f26..89d3394 100644
--- a/i18n/da/sysinfo.ts
+++ b/i18n/da/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -346,6 +342,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -389,5 +389,9 @@ to this process?</source>
         <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 217f99a..62b20ab 100644
--- a/i18n/da/tableviewer.ts
+++ b/i18n/da/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Kunne ikke lave en standard værdi for typen %1, Nøglen blev ikke tilføjet.</translation>
+        <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>DataElem::setField(%1, %2) Ingen brugbar type fundet</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) Ingen brugbar type fundet</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/da/textedit.ts b/i18n/da/textedit.ts
index 68323f2..d0b21ad 100644
--- a/i18n/da/textedit.ts
+++ b/i18n/da/textedit.ts
@@ -201,6 +201,10 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
         <translation>Er du sikker på at du vil&lt;br&gt;&lt;b&gt;slette&lt;/b&gt; den nuværende fil
  fra disken?&lt;br&gt;Det kan &lt;b&gt;ikke fortrydes!&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/da/today.ts b/i18n/da/today.ts
index 343335c..c25f037 100644
--- a/i18n/da/today.ts
+++ b/i18n/da/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Idag</translation>
+        <translation type="unfinished">Idag</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -19,7 +19,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Ingen plugins fundet</translation>
+        <translation type="obsolete">Ingen plugins fundet</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -29,6 +29,14 @@
         <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>
diff --git a/i18n/da/todolist.ts b/i18n/da/todolist.ts
index 5fdb160..451ee80 100644
--- a/i18n/da/todolist.ts
+++ b/i18n/da/todolist.ts
@@ -9,6 +9,29 @@
         <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>
@@ -34,6 +57,17 @@
     </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>
@@ -53,46 +87,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Opie Opgaveliste</translation>
+        <translation type="obsolete">Opie Opgaveliste</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Ny fra skabelon</translation>
+        <translation type="obsolete">Ny fra skabelon</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Ny opgave</translation>
+        <translation type="obsolete">Ny opgave</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Klik her for at oprette en ny opgave.</translation>
+        <translation type="obsolete">Klik her for at oprette en ny opgave.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Rediger opgave</translation>
+        <translation type="obsolete">Rediger opgave</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Klik her for at redigere den valgte opgave.</translation>
+        <translation type="obsolete">Klik her for at redigere den valgte opgave.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Vis opgave</translation>
+        <translation type="obsolete">Vis opgave</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Slet...</translation>
+        <translation type="obsolete">Slet...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Klik her for at fjerne den valgte opgave.</translation>
+        <translation type="obsolete">Klik her for at fjerne den valgte opgave.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Slet alle...</translation>
+        <translation type="obsolete">Slet alle...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,15 +134,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>Send</translation>
+        <translation type="obsolete">Send</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Klik her for at sende den valgte opgave til en anden enhed.</translation>
+        <translation type="obsolete">Klik her for at sende den valgte opgave til en anden enhed.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Find</translation>
+        <translation type="obsolete">Find</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -128,15 +162,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategori</translation>
+        <translation type="obsolete">Kategori</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Valgmuligheder</translation>
+        <translation type="obsolete">Valgmuligheder</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -160,7 +194,7 @@ Listen viser følgende information:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Alle kategorier</translation>
+        <translation type="obsolete">Alle kategorier</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -198,7 +232,7 @@ Afslut alligevel?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Ikke-arkiverede</translation>
+        <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>
@@ -210,7 +244,7 @@ Afslut alligevel?</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplikere</translation>
+        <translation type="obsolete">Duplikere</translation>
     </message>
     <message>
         <source>C.</source>
@@ -230,7 +264,7 @@ Afslut alligevel?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Konfigurer skabeloner</translation>
+        <translation type="obsolete">Konfigurer skabeloner</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/da/wellenreiter.ts b/i18n/da/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/da/wellenreiter.ts
+++ b/i18n/da/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/da/zlines.ts b/i18n/da/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/da/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/zsafe.ts b/i18n/da/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/da/zsafe.ts
+++ b/i18n/da/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/zsame.ts b/i18n/da/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/da/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/advancedfm.ts b/i18n/de/advancedfm.ts
index 8a43b9e..41f1b54 100644
--- a/i18n/de/advancedfm.ts
+++ b/i18n/de/advancedfm.ts
@@ -72,7 +72,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Verzeichnis existiert nicht</translation>
+        <translation type="obsolete">Verzeichnis existiert nicht</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -149,19 +149,19 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Konnte nicht kopieren
+        <translation type="obsolete">Konnte nicht kopieren
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>nach
+        <translation type="obsolete">nach
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Nicht verschiebbar
+        <translation type="obsolete">Nicht verschiebbar
 </translation>
     </message>
     <message>
@@ -179,7 +179,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Wirklich %1 Dateien löschen?</translation>
+        <translation type="obsolete">Wirklich %1 Dateien löschen?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
@@ -188,7 +188,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Wirklich %1 Dateien kopieren?</translation>
+        <translation type="obsolete">Wirklich %1 Dateien kopieren?</translation>
     </message>
     <message>
         <source>File Exists!</source>
@@ -197,29 +197,29 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 existiert. Überschreiben?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>existiert bereits.
+        <translation type="obsolete">existiert bereits.
 Soll wirklich gelöscht werden?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 existiert. Überschreiben?</translation>
+        <translation type="obsolete">%1 existiert. Überschreiben?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>%1 konnte nicht zu %2 kopiert werden</translation>
+        <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>Dateimanager
+        <translation type="obsolete">Dateimanager
 Copyright 2002-2003 von
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 unter der GPL</translation>
@@ -240,7 +240,7 @@ unter der GPL</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Kann das aktuelle Verzeichnis
+        <translation type="obsolete">Kann das aktuelle Verzeichnis
 von den Lesezeichen nicht entfernen,
 da es nicht in den Lesezeichen ist!</translation>
     </message>
@@ -251,12 +251,12 @@ da es nicht in den Lesezeichen ist!</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>%1 und alle Inhalte wirklich löschen?</translation>
+        <translation type="obsolete">%1 und alle Inhalte wirklich löschen?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>%1 wirklich löschen?</translation>
+        <translation type="obsolete">%1 wirklich löschen?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
@@ -283,11 +283,75 @@ and all it&apos;s contents ?</source>
 %1 
 to 
 %2</source>
-        <translation>%1
+        <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 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>
diff --git a/i18n/de/backup.ts b/i18n/de/backup.ts
index 1e83aad..f8eb8f8 100644
--- a/i18n/de/backup.ts
+++ b/i18n/de/backup.ts
@@ -4,7 +4,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Sichern und Wiederherstellen... arbeitet ...</translation>
+        <translation type="obsolete">Sichern und Wiederherstellen... arbeitet ...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -64,6 +64,14 @@
         <source>Restore Successful.</source>
         <translation>Rückspielen erfolgreich.</translation>
     </message>
+    <message>
+        <source>Backing up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Backup...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -81,7 +89,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Speichern nach</translation>
+        <translation type="obsolete">Speichern nach</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -127,6 +135,22 @@
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/de/bartender.ts b/i18n/de/bartender.ts
index 6294167..7e37b5b 100644
--- a/i18n/de/bartender.ts
+++ b/i18n/de/bartender.ts
@@ -90,7 +90,7 @@
     </message>
     <message>
         <source>Find by Alcohol</source>
-        <translation>Suche nach Alkohol</translation>
+        <translation type="obsolete">Suche nach Alkohol</translation>
     </message>
     <message>
         <source>Edit</source>
@@ -98,7 +98,7 @@
     </message>
     <message>
         <source>edit</source>
-        <translation>bearbeiten</translation>
+        <translation type="obsolete">bearbeiten</translation>
     </message>
     <message>
         <source>New</source>
@@ -137,7 +137,7 @@
     </message>
     <message>
         <source>Alcohol</source>
-        <translation>Alkohol</translation>
+        <translation type="obsolete">Alkohol</translation>
     </message>
     <message>
         <source>Search</source>
@@ -149,6 +149,23 @@
         <translation>Keine Ergebnisse für
 </translation>
     </message>
+    <message>
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/de/bluetooth-manager.ts b/i18n/de/bluetooth-manager.ts
index 84c0b6a..83d547e 100644
--- a/i18n/de/bluetooth-manager.ts
+++ b/i18n/de/bluetooth-manager.ts
@@ -90,7 +90,7 @@
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
-        <translation>Bluetooth Basiskonfiguration</translation>
+        <translation type="obsolete">Bluetooth Basiskonfiguration</translation>
     </message>
     <message>
         <source>Default Passkey</source>
@@ -128,6 +128,10 @@
         <source>Status Label</source>
         <translation>Statuslabel</translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/de/dagger.ts b/i18n/de/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/de/dagger.ts
+++ b/i18n/de/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/de/launchersettings.ts b/i18n/de/launchersettings.ts
index 68b6a68..b635447 100644
--- a/i18n/de/launchersettings.ts
+++ b/i18n/de/launchersettings.ts
@@ -181,6 +181,14 @@
         <source>Color:</source>
         <translation>Farbe: </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>
diff --git a/i18n/de/libGPRS.ts b/i18n/de/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/de/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libaboutapplet.ts b/i18n/de/libaboutapplet.ts
index b064b9f..0e0b5ee 100644
--- a/i18n/de/libaboutapplet.ts
+++ b/i18n/de/libaboutapplet.ts
@@ -15,7 +15,7 @@
     <name>AboutDialog</name>
     <message>
         <source>About</source>
-        <translation>Über</translation>
+        <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>
@@ -43,7 +43,7 @@ Besuchen  Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.h
     </message>
     <message>
         <source>Authors</source>
-        <translation>Autoren</translation>
+        <translation type="obsolete">Autoren</translation>
     </message>
     <message>
         <source>&lt;p&gt;
@@ -69,7 +69,7 @@ Besuchen  Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.h
     </message>
     <message>
         <source>Report</source>
-        <translation>Report</translation>
+        <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;
@@ -81,7 +81,7 @@ Besuchen  Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.h
     </message>
     <message>
         <source>Join</source>
-        <translation>Schließen  Sie sich an</translation>
+        <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;
@@ -105,7 +105,7 @@ No single group, company or organization controls the Opie source code. Everyone
 &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;
+        <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;
@@ -118,7 +118,7 @@ Keine Gruppe, Firma oder Organisation kontrolliert den Opie Quellcode. Jeder ist
         <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)
+        <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>
@@ -126,13 +126,47 @@ Keine Gruppe, Firma oder Organisation kontrolliert den Opie Quellcode. Jeder ist
         <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)
+        <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>&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</translation>
+        <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 type="unfinished">Ü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="unfinished">&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 type="unfinished">&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 type="unfinished">Autoren</translation>
     </message>
     <message>
         <source>&lt;p&gt;
@@ -146,7 +180,31 @@ Keine Gruppe, Firma oder Organisation kontrolliert den Opie Quellcode. Jeder ist
 &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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished">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 type="unfinished">&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="unfinished">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 type="unfinished">&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>
 </context>
 </TS>
diff --git a/i18n/de/libbatteryapplet.ts b/i18n/de/libbatteryapplet.ts
index 5a7ebbc..70a3cfc 100644
--- a/i18n/de/libbatteryapplet.ts
+++ b/i18n/de/libbatteryapplet.ts
@@ -20,7 +20,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Verbleibende Energie in Prozent: </translation>
+        <translation type="obsolete">Verbleibende Energie in Prozent: </translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -60,15 +60,15 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Verbleibende Batteriezeit</translation>
+        <translation type="obsolete">Verbleibende Batteriezeit</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Verbleibende Energie in Prozent:</translation>
+        <translation type="obsolete">Verbleibende Energie in Prozent:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Verbleibende Batteriezeit:</translation>
+        <translation type="obsolete">Verbleibende Batteriezeit:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -88,11 +88,28 @@
     </message>
     <message>
         <source>Ipaq  </source>
-        <translation>iPAQ</translation>
+        <translation type="obsolete">iPAQ</translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation>Jacket</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/de/libbluetooth.ts b/i18n/de/libbluetooth.ts
index c1dbac3..bfd3354 100644
--- a/i18n/de/libbluetooth.ts
+++ b/i18n/de/libbluetooth.ts
@@ -53,15 +53,35 @@
     </message>
     <message>
         <source>Description</source>
-        <translation>Beschreibung</translation>
+        <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
         <source>Start automatically</source>
-        <translation>Automatisch starten</translation>
+        <translation type="obsolete">Automatisch starten</translation>
     </message>
     <message>
         <source>Confirm before start</source>
-        <translation>Start bestätigen</translation>
+        <translation type="obsolete">Start bestätigen</translation>
+    </message>
+    <message>
+        <source>Selected devices with gprs capability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -75,4 +95,11 @@
         <translation>&lt;p&gt;Konfiguriert eine serielle BlueTooth Verbindung.&lt;/p&gt;&lt;p&gt;Dies verdenden für GSM.&lt;/p&gt;</translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/libbrightnessapplet.ts b/i18n/de/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libcable.ts b/i18n/de/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/de/libcable.ts
+++ b/i18n/de/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/de/libcardmonapplet.ts b/i18n/de/libcardmonapplet.ts
index 6ce62c6..241bd1e 100644
--- a/i18n/de/libcardmonapplet.ts
+++ b/i18n/de/libcardmonapplet.ts
@@ -32,11 +32,11 @@
     </message>
     <message>
         <source>New card: SD/MMC</source>
-        <translation type="obsolete">Neue Karte: SD / MMC</translation>
+        <translation type="unfinished">Neue Karte: SD / MMC</translation>
     </message>
     <message>
         <source>Ejected: SD/MMC</source>
-        <translation type="obsolete">Ausgeworfen: SD / MMC</translation>
+        <translation type="unfinished">Ausgeworfen: SD / MMC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libexample_applet.ts b/i18n/de/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/de/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libexample_board.ts b/i18n/de/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/de/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libexample_vpn.ts b/i18n/de/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/de/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libinterfaces.ts b/i18n/de/libinterfaces.ts
index 179569b..e8ebe34 100644
--- a/i18n/de/libinterfaces.ts
+++ b/i18n/de/libinterfaces.ts
@@ -1,6 +1,13 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"> Interface-Neustart</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/de/libkppp.ts b/i18n/de/libkppp.ts
index d70516d..28c7fdd 100644
--- a/i18n/de/libkppp.ts
+++ b/i18n/de/libkppp.ts
@@ -455,6 +455,10 @@ neues Gerät kopiert, das modifiziert werden kann</translation>
         <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>
diff --git a/i18n/de/liblancard.ts b/i18n/de/liblancard.ts
index 43c6935..13ee946 100644
--- a/i18n/de/liblancard.ts
+++ b/i18n/de/liblancard.ts
@@ -38,4 +38,11 @@
         <translation>&lt;p&gt;Konfiguriert eine LAN Karte.&lt;/p&gt;&lt;p&gt;Dies verwenden für 10/100/1000 MBit LAN Karten.&lt;/p&gt;</translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/liblockapplet.ts b/i18n/de/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/de/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libmailwrapper.ts b/i18n/de/libmailwrapper.ts
index 88848f5..1e42bfd 100644
--- a/i18n/de/libmailwrapper.ts
+++ b/i18n/de/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation>Fehler beim Löschen von Nachricht %1</translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/de/libmemoryapplet.ts b/i18n/de/libmemoryapplet.ts
index 6a1190f..d3ca8f3 100644
--- a/i18n/de/libmemoryapplet.ts
+++ b/i18n/de/libmemoryapplet.ts
@@ -124,7 +124,7 @@ Speicher wird wie folgt eingeteilt:
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation>2 Mb,4 Mb,6 Mb,8 Mb</translation>
+        <translation type="obsolete">2 Mb,4 Mb,6 Mb,8 Mb</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
@@ -162,5 +162,9 @@ Speicher wird wie folgt eingeteilt:
         <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/de/libnetworksettings2.ts b/i18n/de/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/de/libnetworksettings2.ts
+++ b/i18n/de/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/de/libopiemm2.ts b/i18n/de/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/de/libopiemm2.ts
+++ b/i18n/de/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/libopiepim2.ts b/i18n/de/libopiepim2.ts
index bc63ef5..dbe311c 100644
--- a/i18n/de/libopiepim2.ts
+++ b/i18n/de/libopiepim2.ts
@@ -598,6 +598,109 @@ und</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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1049,6 +1152,34 @@ und</translation>
         <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>
diff --git a/i18n/de/libopiesecurity2.ts b/i18n/de/libopiesecurity2.ts
index b52d8c9..014bc36 100644
--- a/i18n/de/libopiesecurity2.ts
+++ b/i18n/de/libopiesecurity2.ts
@@ -31,7 +31,7 @@
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
         <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation type="unfinished">Willkommen zum  Opie Multi-authentication Framework</translation>
+        <translation type="obsolete">Willkommen zum  Opie Multi-authentication Framework</translation>
     </message>
     <message>
         <source>Launching authentication plugins...</source>
@@ -43,7 +43,7 @@
     </message>
     <message>
         <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation type="unfinished">Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
+        <translation type="obsolete">Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
     </message>
     <message>
         <source>Congratulations! Your authentication has been successful.</source>
@@ -51,10 +51,22 @@
     </message>
     <message>
         <source>You have not succeeded enough authentication steps!</source>
-        <translation type="unfinished">Nicht genügend Anmeldungsschritte bestanden!</translation>
+        <translation type="obsolete">Nicht genügend Anmeldungsschritte bestanden!</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
+        <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/de/libopietooth2.ts b/i18n/de/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/de/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libopietooth2applet.ts b/i18n/de/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/de/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libopieui2.ts b/i18n/de/libopieui2.ts
index 0dd7406..681d4de 100644
--- a/i18n/de/libopieui2.ts
+++ b/i18n/de/libopieui2.ts
@@ -113,19 +113,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">Dateidialog</translation>
+        <translation type="obsolete">Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Öffnen</translation>
+        <translation type="obsolete">Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Speichern</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichern</translation>
     </message>
 </context>
 <context>
@@ -173,15 +169,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Stil</translation>
+        <translation type="obsolete">Stil</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Größe</translation>
+        <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="unfinished">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
+        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
 </context>
 <context>
@@ -450,15 +446,19 @@ und</translation>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">Dateidialog</translation>
+        <translation type="unfinished">Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Öffnen</translation>
+        <translation type="unfinished">Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Speichern</translation>
+        <translation type="unfinished">Speichern</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -472,15 +472,15 @@ und</translation>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Stil</translation>
+        <translation type="unfinished">Stil</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Größe</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/libphasestyle.ts b/i18n/de/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/de/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libppp.ts b/i18n/de/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/de/libppp.ts
+++ b/i18n/de/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/de/libprofile.ts b/i18n/de/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/de/libprofile.ts
+++ b/i18n/de/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/de/libqpickboard.ts b/i18n/de/libqpickboard.ts
index 4c83d79..969f7f5 100644
--- a/i18n/de/libqpickboard.ts
+++ b/i18n/de/libqpickboard.ts
@@ -1,10 +1,90 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/libscreenshotapplet.ts b/i18n/de/libscreenshotapplet.ts
index b6d2125..227f41e 100644
--- a/i18n/de/libscreenshotapplet.ts
+++ b/i18n/de/libscreenshotapplet.ts
@@ -46,5 +46,13 @@
         <source>Connection to %1 failed.</source>
         <translation>Verbindung zu %1 fehlgeschlagen</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libtodayaddressbookplugin.ts b/i18n/de/libtodayaddressbookplugin.ts
index f0e4bc5..6995657 100644
--- a/i18n/de/libtodayaddressbookplugin.ts
+++ b/i18n/de/libtodayaddressbookplugin.ts
@@ -12,11 +12,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Zeile abschneiden nach N Einträgen: </translation>
+        <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>Nach wie vielen Zeichen soll Zeiel abgeschnitten werden</translation>
+        <translation type="obsolete">Nach wie vielen Zeichen soll Zeiel abgeschnitten werden</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
@@ -28,7 +28,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Einstellungen aktivieren: Anwendung neu starten !</translation>
+        <translation type="obsolete">Einstellungen aktivieren: Anwendung neu starten !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
diff --git a/i18n/de/libtodayexampleplugin.ts b/i18n/de/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/de/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libtodayweatherplugin.ts b/i18n/de/libtodayweatherplugin.ts
index cd9d8c6..a17335d 100644
--- a/i18n/de/libtodayweatherplugin.ts
+++ b/i18n/de/libtodayweatherplugin.ts
@@ -108,11 +108,15 @@ Druck:</translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation>hPa</translation>
+        <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/de/libvolumeapplet2.ts b/i18n/de/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libvpn.ts b/i18n/de/libvpn.ts
index 9e4dc02..ee989fb 100644
--- a/i18n/de/libvpn.ts
+++ b/i18n/de/libvpn.ts
@@ -27,11 +27,15 @@
     <name>VPNNetNode</name>
     <message>
         <source>VPN Connection</source>
-        <translation>VPN Verbindung</translation>
+        <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 type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libwebstyle.ts b/i18n/de/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/de/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libwlan.ts b/i18n/de/libwlan.ts
index 6f3c07a..df1da84 100644
--- a/i18n/de/libwlan.ts
+++ b/i18n/de/libwlan.ts
@@ -1,9 +1,6 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -196,9 +193,14 @@
         <source>Signal</source>
         <translation type="obsolete">Signal</translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
+    <message>
+        <source>SSID</source>
+        <translation type="obsolete">SSID</translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="obsolete">Chn</translation>
+    </message>
 </context>
 <context>
     <name>WlanInfo</name>
diff --git a/i18n/de/main-tab.ts b/i18n/de/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/de/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/multiauth.ts b/i18n/de/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/networksettings2.ts b/i18n/de/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/de/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/opie-console.ts b/i18n/de/opie-console.ts
index 870c7af..ba9e789 100644
--- a/i18n/de/opie-console.ts
+++ b/i18n/de/opie-console.ts
@@ -267,6 +267,28 @@ Verbindung</translation>
         <source>Edit Key</source>
         <translation>Schlüssel bearbeiten</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -358,6 +380,18 @@ Verbindung</translation>
         <source>9600 baud</source>
         <translation>9600 baud</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 baud</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 baud</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 baud</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -491,6 +525,18 @@ Verbindung</translation>
         <source>Save Profile</source>
         <translation>Profil speichern</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>
@@ -749,7 +795,7 @@ Verbindung</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Nummer wählen fehlgeschlagen.</translation>
+        <translation type="obsolete">Nummer wählen fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -787,6 +833,14 @@ Verbindung</translation>
         <source>Dismiss</source>
         <translation>Aufgeben</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>
@@ -807,19 +861,19 @@ Verbindung</translation>
     </message>
     <message>
         <source>Font size</source>
-        <translation>Schriftgröße</translation>
+        <translation type="obsolete">Schriftgröße</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>klein</translation>
+        <translation type="obsolete">klein</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>mittel</translation>
+        <translation type="obsolete">mittel</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>groß</translation>
+        <translation type="obsolete">groß</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/de/opie-eye.ts b/i18n/de/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/de/opie-eye.ts
+++ b/i18n/de/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/de/opie-eye_slave.ts b/i18n/de/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/de/opie-eye_slave.ts
+++ b/i18n/de/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/de/opie-login.ts b/i18n/de/opie-login.ts
index 867f12e..db9ab50 100644
--- a/i18n/de/opie-login.ts
+++ b/i18n/de/opie-login.ts
@@ -11,7 +11,7 @@ kalibrieren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Willkommen zu OPIE</translation>
+        <translation type="obsolete">Willkommen zu OPIE</translation>
     </message>
 </context>
 <context>
@@ -100,7 +100,54 @@ Signal beendet: %1</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>&lt;center&gt;Willkommen zu OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
+        <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 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/de/opie-sheet.ts b/i18n/de/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/de/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/opie-update-symlinks.ts b/i18n/de/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/opieirc.ts b/i18n/de/opieirc.ts
index 90d17c0..5539261 100644
--- a/i18n/de/opieirc.ts
+++ b/i18n/de/opieirc.ts
@@ -16,7 +16,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
@@ -59,6 +59,21 @@
     </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>
@@ -90,7 +105,7 @@
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Spitznamen Änderung einer unbekannten Person</translation>
+        <translation type="obsolete">Spitznamen Änderung einer unbekannten Person</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
@@ -110,7 +125,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>CTCP VERSION erhalten von </translation>
+        <translation type="obsolete">CTCP VERSION erhalten von </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -210,16 +225,113 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>Du bis nun als %1 bekannt</translation>
+        <translation type="obsolete">Du bis nun als %1 bekannt</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 ist nun bekannt als %2</translation>
+        <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 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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -316,7 +428,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>Port benötigt</translation>
+        <translation type="obsolete">Port benötigt</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -324,7 +436,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>Echter Name benötigt</translation>
+        <translation type="obsolete">Echter Name benötigt</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -378,7 +490,7 @@ enthalten, die mit &apos;#&apos; oder &apos;+&apos; anfangen</translation>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Verbindung mit</translation>
+        <translation type="obsolete">Verbindung mit</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -388,6 +500,25 @@ enthalten, die mit &apos;#&apos; oder &apos;+&apos; anfangen</translation>
         <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCSession</name>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished">Du bis nun als %1 bekannt</translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished">Spitznamen Änderung einer unbekannten Person</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished">%1 ist nun bekannt als %2</translation>
+    </message>
 </context>
 <context>
     <name>IRCSettings</name>
@@ -467,6 +598,14 @@ enthalten, die mit &apos;#&apos; oder &apos;+&apos; anfangen</translation>
         <source>Settings</source>
         <translation>Einstellungen</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>
@@ -514,4 +653,31 @@ enthalten, die mit &apos;#&apos; oder &apos;+&apos; anfangen</translation>
         <translation>Konfiguriere OpieIRC&apos;s Verhalten und Aussehen</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/de/opiemail.ts b/i18n/de/opiemail.ts
index 7465f28..2f8428a 100644
--- a/i18n/de/opiemail.ts
+++ b/i18n/de/opiemail.ts
@@ -95,10 +95,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -118,6 +114,10 @@
         <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>
@@ -438,17 +438,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -831,6 +831,18 @@ Alle Mails werden entfernt.</translation>
         <source>Password</source>
         <translation type="unfinished">Passwort</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>
@@ -1056,13 +1068,13 @@ Alle Mails werden entfernt.</translation>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished">Post</translation>
@@ -1099,6 +1111,10 @@ Alle Mails werden entfernt.</translation>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/de/opieplayer2.ts b/i18n/de/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/de/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/de/opierec.ts b/i18n/de/opierec.ts
index 8fcba89..4a42b91 100644
--- a/i18n/de/opierec.ts
+++ b/i18n/de/opierec.ts
@@ -115,7 +115,7 @@ wurde nicht erkannt</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>Sekunden</translation>
+        <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;
@@ -183,15 +183,15 @@ Datei &lt;font size=+2&gt;&lt;B&gt;LÖSCHEN&lt;/B&gt;&lt;/font&gt;?</translation
     </message>
     <message>
         <source>Rec</source>
-        <translation>Aufn</translation>
+        <translation type="obsolete">Aufn</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>Ort</translation>
+        <translation type="obsolete">Ort</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Datum</translation>
+        <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
@@ -207,7 +207,7 @@ Datei &lt;font size=+2&gt;&lt;B&gt;LÖSCHEN&lt;/B&gt;&lt;/font&gt;?</translation
     </message>
     <message>
         <source>Stop</source>
-        <translation>Stopp</translation>
+        <translation type="obsolete">Stopp</translation>
     </message>
     <message>
         <source>Auto Mute</source>
@@ -215,7 +215,15 @@ Datei &lt;font size=+2&gt;&lt;B&gt;LÖSCHEN&lt;/B&gt;&lt;/font&gt;?</translation
     </message>
     <message>
         <source>Stereo Channels</source>
-        <translation>Stereo Kanäle</translation>
+        <translation type="obsolete">Stereo Kanäle</translation>
+    </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opimconverter.ts b/i18n/de/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/de/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/oxygen.ts b/i18n/de/oxygen.ts
index 809888e..e7c99ac 100644
--- a/i18n/de/oxygen.ts
+++ b/i18n/de/oxygen.ts
@@ -26,6 +26,10 @@
         <source>Elemental Composition (%):</source>
         <translation>elementare Zusammensetzung (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/de/oyatzee.ts b/i18n/de/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/de/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/packagemanager.ts b/i18n/de/packagemanager.ts
index fb1f60e..d6745d0 100644
--- a/i18n/de/packagemanager.ts
+++ b/i18n/de/packagemanager.ts
@@ -60,6 +60,46 @@
         <source>Installed on device at:</source>
         <translation>Installiert auf:</translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -380,7 +420,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Klicken Sie hier für eine aktualisierte Fassung der Serverliste.</translation>
+        <translation type="obsolete">Klicken Sie hier für eine aktualisierte Fassung der Serverliste.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -388,7 +428,7 @@
     </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>
+        <translation type="obsolete">Klicken Sie hier, um alle installierten Pakete zu aktualisieren, siofern eine neuere Version vorhanden ist.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -396,7 +436,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Klicken Sie hier um das ausgewählte Paket downzuloaden.</translation>
+        <translation type="obsolete">Klicken Sie hier um das ausgewählte Paket downzuloaden.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -404,7 +444,7 @@
     </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>
+        <translation type="obsolete">Klicken Sie hier, um das ausgewählte Paket zu löschen oder zu aktualisieren.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -416,7 +456,7 @@
     </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>
+        <translation type="obsolete">Klicken Sie hier um Pakete anzuzeigen, die nicht installiert wurden.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -424,7 +464,7 @@
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>Klicken Sie hier um installierte Pakete anzuzeigen.</translation>
+        <translation type="obsolete">Klicken Sie hier um installierte Pakete anzuzeigen.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -432,7 +472,7 @@
     </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>
+        <translation type="obsolete">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>
@@ -456,7 +496,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Klicken Sie hier um Text in Paketnamen zu suchen.</translation>
+        <translation type="obsolete">Klicken Sie hier um Text in Paketnamen zu suchen.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -464,7 +504,7 @@
     </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>
+        <translation type="obsolete">Klicken Sie hier um das nächste Paket mit Ihrem Suchtext zu finden.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -484,11 +524,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Klicken Sie hier um die Finden-Leiste auszublenden.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -645,22 +685,12 @@ löschen oder aktualisieren ?</translation>
         <translation type="obsolete">Aktualisiere Launcher...</translation>
     </message>
     <message>
-        <source>This is a listing of all packages.
-
-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 type="unfinished"></translation>
-    </message>
-    <message>
         <source>Filter</source>
         <translation></translation>
     </message>
     <message>
         <source>Click here to apply current filter.</source>
-        <translation>Hier clicken um den Filter anzuwenden.</translation>
+        <translation type="obsolete">Hier clicken um den Filter anzuwenden.</translation>
     </message>
     <message>
         <source>Filter settings</source>
@@ -668,7 +698,7 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Click here to change the package filter criteria.</source>
-        <translation>Hier clicken um den Filter zu ändern.</translation>
+        <translation type="obsolete">Hier clicken um den Filter zu ändern.</translation>
     </message>
     <message>
         <source>Package Manager</source>
@@ -710,20 +740,102 @@ Click inside the box at the left to select a package.</source>
         <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation>Die Konfiguration wurde aktualisiert. Möchten Sie die Paketinformationen erneuern?</translation>
     </message>
+    <message>
+        <source>This is a listing of all packages.
+
+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.
+
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to update package lists from servers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to download the currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install local package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install a package file located on device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to configure this application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages available which have not been installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to apply current filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to change the package filter criteria.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to search for text in package names.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Error initialing libipkg</source>
-        <translation>Fehler beim Initialisieren von libipkg</translation>
+        <translation type="obsolete">Fehler beim Initialisieren von libipkg</translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
-        <translation>Fehler beim entladen von libipkg</translation>
+        <translation type="obsolete">Fehler beim entladen von libipkg</translation>
+    </message>
+    <message>
+        <source>Linking packages installed in: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Links removed for: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -758,23 +870,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation>Server</translation>
+        <translation type="obsolete">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Name: </translation>
+        <translation type="obsolete">Name: </translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation>Adresse:</translation>
+        <translation type="obsolete">Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation>Aktiver Server</translation>
+        <translation type="obsolete">Aktiver Server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation>Aktualisierung</translation>
+        <translation type="obsolete">Aktualisierung</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -832,6 +944,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation>Ausgaben zur Fehlersuche</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Name: </translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Ort:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Name: </translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Adresse:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -866,6 +1120,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation>Dateiliste</translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/de/powerchord.ts b/i18n/de/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/de/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/de/pyquicklauncher.ts b/i18n/de/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index 90cdb4a..97f77cb 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -252,6 +252,13 @@ mittig um das Display zu kalibrieren.</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>
@@ -271,6 +278,13 @@ mittig um das Display zu kalibrieren.</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>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index 9e05c1a..98e6e41 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -73,39 +73,35 @@ Login einzustellen.</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation>&lt;p&gt;Alle manuell erstellten Werte gehen verloren.</translation>
+        <translation type="obsolete">&lt;p&gt;Alle manuell erstellten Werte gehen verloren.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation>192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -115,6 +111,26 @@ Login einzustellen.</translation>
         <source>None</source>
         <translation>Keine</translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -140,7 +156,7 @@ Login einzustellen.</translation>
     </message>
     <message>
         <source>Debug options</source>
-        <translation>Debug Optionen</translation>
+        <translation type="obsolete">Debug Optionen</translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
@@ -152,11 +168,43 @@ Login einzustellen.</translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
-        <translation>Umgehen der Anmeldung erlauben</translation>
+        <translation type="obsolete">Umgehen der Anmeldung erlauben</translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
-        <translation>Hinweis: Die dritte Option erfordert die zweite Option</translation>
+        <translation type="obsolete">Hinweis: Die dritte Option erfordert die zweite Option</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">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 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">Abbrechen</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -380,7 +428,7 @@ geänderten Daten gehen dabei verloren!</translation>
 <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>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/de/sfcave-sdl.ts b/i18n/de/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/sfcave.ts b/i18n/de/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/de/sfcave.ts
+++ b/i18n/de/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/simple-icon.ts b/i18n/de/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/de/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/simple-main.ts b/i18n/de/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/de/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/simple-pim.ts b/i18n/de/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/de/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/simple.ts b/i18n/de/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/de/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/stocktickertest.ts b/i18n/de/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/de/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/sysinfo.ts b/i18n/de/sysinfo.ts
index 70f0f61..9648284 100644
--- a/i18n/de/sysinfo.ts
+++ b/i18n/de/sysinfo.ts
@@ -62,10 +62,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -352,6 +348,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -395,5 +395,9 @@ to this process?</source>
         <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/de/tableviewer.ts b/i18n/de/tableviewer.ts
index 92f72a7..c5e31a4 100644
--- a/i18n/de/tableviewer.ts
+++ b/i18n/de/tableviewer.ts
@@ -4,11 +4,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Kann keinen Standartwert für Typ %1 erstellen, Key nicht hinzugefügt.</translation>
+        <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>DataElem::setField(%1, %2) Kein gültiger Typ gefunden</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) Kein gültiger Typ gefunden</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/textedit.ts b/i18n/de/textedit.ts
index 6df8394..2086117 100644
--- a/i18n/de/textedit.ts
+++ b/i18n/de/textedit.ts
@@ -209,6 +209,10 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
 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 type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index bf3570e..f33f4a0 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -14,6 +14,29 @@
         <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">nicht eingeteilt</translation>
+    </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Neue Aufgabe</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>
@@ -39,6 +62,17 @@
     </message>
 </context>
 <context>
+    <name>Opie</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Aufgabenliste</translation>
+    </message>
+    <message>
+        <source>Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
@@ -58,46 +92,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Opie Aufgaben</translation>
+        <translation type="obsolete">Opie Aufgaben</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Neu von Vorlage</translation>
+        <translation type="obsolete">Neu von Vorlage</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Neue Aufgabe</translation>
+        <translation type="obsolete">Neue Aufgabe</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Hier klicken, um eine neue Aufgabe zu erzeugen.</translation>
+        <translation type="obsolete">Hier klicken, um eine neue Aufgabe zu erzeugen.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Aufgabe editieren</translation>
+        <translation type="obsolete">Aufgabe editieren</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Hier klicken, um die aktuelle Aufgabe zu ändern.</translation>
+        <translation type="obsolete">Hier klicken, um die aktuelle Aufgabe zu ändern.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Aufgabe ansehen</translation>
+        <translation type="obsolete">Aufgabe ansehen</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Löschen...</translation>
+        <translation type="obsolete">Löschen...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Hier klicken, um die aktuelle Aufgabe zu löschen.</translation>
+        <translation type="obsolete">Hier klicken, um die aktuelle Aufgabe zu löschen.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Alles löschen...</translation>
+        <translation type="obsolete">Alles löschen...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -105,15 +139,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>Senden</translation>
+        <translation type="obsolete">Senden</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Hier klicken, um die aktuelle Aufgabe an ein anderes Gerät zu senden.</translation>
+        <translation type="obsolete">Hier klicken, um die aktuelle Aufgabe an ein anderes Gerät zu senden.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -133,15 +167,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Datei</translation>
+        <translation type="obsolete">Datei</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Optionen</translation>
+        <translation type="obsolete">Optionen</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -165,7 +199,7 @@ Die Liste zeigt folgende Informationen:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Alle Kategorien</translation>
+        <translation type="obsolete">Alle Kategorien</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -203,7 +237,7 @@ Es wird gerade synchronisiert</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>nicht eingeteilt</translation>
+        <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>
@@ -215,7 +249,7 @@ Es wird gerade synchronisiert</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplizieren</translation>
+        <translation type="obsolete">Duplizieren</translation>
     </message>
     <message>
         <source>C.</source>
@@ -235,7 +269,7 @@ Es wird gerade synchronisiert</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Vorlagen konfigurieren</translation>
+        <translation type="obsolete">Vorlagen konfigurieren</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/de/wellenreiter.ts b/i18n/de/wellenreiter.ts
index a537cfc..62a2c95 100644
--- a/i18n/de/wellenreiter.ts
+++ b/i18n/de/wellenreiter.ts
@@ -165,7 +165,7 @@ Bitte Konfiguration prüfen!</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation>&lt;p&gt;Die Wireless Extension Versionen sind inkompatibel!&lt;p&gt; Wellenreiter II: WE V%1&lt;br&gt;Interface Treiber: WE V%2</translation>
+        <translation type="obsolete">&lt;p&gt;Die Wireless Extension Versionen sind inkompatibel!&lt;p&gt; Wellenreiter II: WE V%1&lt;br&gt;Interface Treiber: WE V%2</translation>
     </message>
     <message>
         <source>Can&apos;t set interface &apos;%1&apos;
@@ -216,6 +216,10 @@ joinen eines Netzes.</translation>
         <source>Function only available on Embedded build</source>
         <translation>Funktion nur bei einem Embedded Build verfügbar</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -392,7 +396,7 @@ Michael Lauer&lt;br&gt;&lt;hr&gt;
     </message>
     <message>
         <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation>Wellenreiter II Konfiguration</translation>
+        <translation type="obsolete">Wellenreiter II Konfiguration</translation>
     </message>
     <message>
         <source>Interface</source>
@@ -652,7 +656,7 @@ Michael Lauer&lt;br&gt;&lt;hr&gt;
     </message>
     <message>
         <source>Send proble requests</source>
-        <translation>Probe Requests senden</translation>
+        <translation type="obsolete">Probe Requests senden</translation>
     </message>
     <message>
         <source>&lt;automatic&gt;</source>
@@ -730,6 +734,14 @@ Michael Lauer&lt;br&gt;&lt;hr&gt;
         <source>Command line to start the gps daemon.</source>
         <translation>Befehlszeile um den gps deamon zu starten.</translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/de/zlines.ts b/i18n/de/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/de/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/zsafe.ts b/i18n/de/zsafe.ts
index 90779f4..d5de659 100644
--- a/i18n/de/zsafe.ts
+++ b/i18n/de/zsafe.ts
@@ -431,7 +431,7 @@ Zeigt die Liste der Verzeichnisse und Dateien</translation>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -515,7 +515,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -563,7 +563,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -575,7 +575,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -707,7 +707,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -715,11 +715,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -735,7 +735,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -743,7 +743,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.0&lt;br&gt;</source>
@@ -754,7 +754,7 @@ sichern</translation>
 .../Documents/application
 
 ZSafe will now exit.</source>
-        <translation>Fehler beim Erstellen von
+        <translation type="obsolete">Fehler beim Erstellen von
 ../Documents/application
 
 ZSafe wird beendet.
@@ -765,7 +765,7 @@ ZSafe wird beendet.
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
-        <translation>Fehler beim Erstellen von
+        <translation type="obsolete">Fehler beim Erstellen von
 ..//Documents/application/zsafe
 
 ZSafe wird beendet.
@@ -832,12 +832,40 @@ ein Passwort eingeben
 für das neue Dokument.</translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation></translation>
+        <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 version 2.1.2&lt;br&gt;</source>
-        <translation>ZSafe Version 2.1.2&lt;br&gt;</translation>
+        <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/zsame.ts b/i18n/de/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/de/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/advancedfm.ts b/i18n/dk/advancedfm.ts
index e7e44d6..70a4f46 100644
--- a/i18n/dk/advancedfm.ts
+++ b/i18n/dk/advancedfm.ts
@@ -14,17 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></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="unfinished"></translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -105,12 +94,6 @@ and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -163,11 +146,6 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -180,98 +158,107 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
+        <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1?</source>
+        <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File Exists!</source>
+        <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
+        <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy %1 to %2</source>
+        <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>to
-</source>
+        <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
+        <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> As</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
+        <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>Could not move
-</source>
+        <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>Could not copy 
-%1 
-to 
-%2</source>
+        <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AdvancedFm Output</source>
+        <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advancedfm Beam out</source>
+        <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ir sent.</source>
+        <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
+        <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not rename</source>
+        <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Yet Implemented</source>
+        <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>
diff --git a/i18n/dk/backup.ts b/i18n/dk/backup.ts
index 75e23eb..c6f598c 100644
--- a/i18n/dk/backup.ts
+++ b/i18n/dk/backup.ts
@@ -2,10 +2,6 @@
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
@@ -54,6 +50,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -66,10 +70,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,6 +113,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/dk/bartender.ts b/i18n/dk/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/dk/bartender.ts
+++ b/i18n/dk/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/dk/bluetooth-manager.ts b/i18n/dk/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/dk/bluetooth-manager.ts
+++ b/i18n/dk/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/dk/dagger.ts b/i18n/dk/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/dk/dagger.ts
+++ b/i18n/dk/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/dk/launchersettings.ts b/i18n/dk/launchersettings.ts
index 2ef3cd4..7c7d23c 100644
--- a/i18n/dk/launchersettings.ts
+++ b/i18n/dk/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/dk/libGPRS.ts b/i18n/dk/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/dk/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libaboutapplet.ts b/i18n/dk/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/dk/libaboutapplet.ts
+++ b/i18n/dk/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/dk/libbatteryapplet.ts b/i18n/dk/libbatteryapplet.ts
index 63d7afc..aeb2c4a 100644
--- a/i18n/dk/libbatteryapplet.ts
+++ b/i18n/dk/libbatteryapplet.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -62,27 +58,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
+        <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining: </source>
+        <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <source>Remaing Power: %1 %2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No jacket with battery inserted</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/libbluetooth.ts b/i18n/dk/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/dk/libbluetooth.ts
+++ b/i18n/dk/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/dk/libbrightnessapplet.ts b/i18n/dk/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/dk/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/dk/libcable.ts b/i18n/dk/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/dk/libcable.ts
+++ b/i18n/dk/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/libcardmonapplet.ts b/i18n/dk/libcardmonapplet.ts
index 3637f01..37329c3 100644
--- a/i18n/dk/libcardmonapplet.ts
+++ b/i18n/dk/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/libexample_applet.ts b/i18n/dk/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/dk/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libexample_board.ts b/i18n/dk/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/dk/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libexample_vpn.ts b/i18n/dk/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/dk/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libinterfaces.ts b/i18n/dk/libinterfaces.ts
index e871479..1a11276 100644
--- a/i18n/dk/libinterfaces.ts
+++ b/i18n/dk/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/dk/libkppp.ts b/i18n/dk/libkppp.ts
index bc82034..0982bb0 100644
--- a/i18n/dk/libkppp.ts
+++ b/i18n/dk/libkppp.ts
@@ -335,6 +335,10 @@ the device &quot;%1&quot;?</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/dk/liblancard.ts b/i18n/dk/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/dk/liblancard.ts
+++ b/i18n/dk/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/dk/liblockapplet.ts b/i18n/dk/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/dk/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libmailwrapper.ts b/i18n/dk/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/dk/libmailwrapper.ts
+++ b/i18n/dk/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/dk/libmemoryapplet.ts b/i18n/dk/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/dk/libmemoryapplet.ts
+++ b/i18n/dk/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/dk/libnetworksettings2.ts b/i18n/dk/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/dk/libnetworksettings2.ts
+++ b/i18n/dk/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/libopiemm2.ts b/i18n/dk/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/dk/libopiemm2.ts
+++ b/i18n/dk/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/dk/libopiepim2.ts b/i18n/dk/libopiepim2.ts
index 55cbf62..2a5182b 100644
--- a/i18n/dk/libopiepim2.ts
+++ b/i18n/dk/libopiepim2.ts
@@ -215,6 +215,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
@@ -604,6 +707,34 @@ and </source>
         <source>Sunday</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>
diff --git a/i18n/dk/libopiesecurity2.ts b/i18n/dk/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/dk/libopiesecurity2.ts
+++ b/i18n/dk/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/libopietooth2.ts b/i18n/dk/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/dk/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libopietooth2applet.ts b/i18n/dk/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/dk/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libopieui2.ts b/i18n/dk/libopieui2.ts
index 51a5983..cf55c5f 100644
--- a/i18n/dk/libopieui2.ts
+++ b/i18n/dk/libopieui2.ts
@@ -1,27 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>OTimePickerDialogBase</name>
     <message>
-        <source>FileDialog</source>
+        <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open</source>
+        <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select Directory</source>
+        <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
-        <source>Style</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -29,52 +29,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
-        <source>OTimePickerDialogBase</source>
+        <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time:</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>:</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pick Time:</source>
+        <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Internal::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Size</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
-        <source>Date</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Name:</source>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/libphasestyle.ts b/i18n/dk/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/dk/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libppp.ts b/i18n/dk/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/dk/libppp.ts
+++ b/i18n/dk/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/dk/libprofile.ts b/i18n/dk/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/dk/libprofile.ts
+++ b/i18n/dk/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/dk/libqpickboard.ts b/i18n/dk/libqpickboard.ts
index 488fb8f..694b19e 100644
--- a/i18n/dk/libqpickboard.ts
+++ b/i18n/dk/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/dk/libscreenshotapplet.ts b/i18n/dk/libscreenshotapplet.ts
index ebc9a78..b882fb9 100644
--- a/i18n/dk/libscreenshotapplet.ts
+++ b/i18n/dk/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/libtodayaddressbookplugin.ts b/i18n/dk/libtodayaddressbookplugin.ts
index fef7050..ca0b09b 100644
--- a/i18n/dk/libtodayaddressbookplugin.ts
+++ b/i18n/dk/libtodayaddressbookplugin.ts
@@ -2,10 +2,6 @@
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34,14 +30,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/dk/libtodayexampleplugin.ts b/i18n/dk/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/dk/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libtodayweatherplugin.ts b/i18n/dk/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/dk/libtodayweatherplugin.ts
+++ b/i18n/dk/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/libvolumeapplet2.ts b/i18n/dk/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/dk/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/dk/libvpn.ts b/i18n/dk/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/dk/libvpn.ts
+++ b/i18n/dk/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/libwebstyle.ts b/i18n/dk/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/dk/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/libwlan.ts b/i18n/dk/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/dk/libwlan.ts
+++ b/i18n/dk/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/dk/main-tab.ts b/i18n/dk/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/dk/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/multiauth.ts b/i18n/dk/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/dk/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/dk/networksettings2.ts b/i18n/dk/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/dk/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/opie-console.ts b/i18n/dk/opie-console.ts
index d94b1ed..f6df35f 100644
--- a/i18n/dk/opie-console.ts
+++ b/i18n/dk/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <source>History</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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/dk/opie-eye.ts b/i18n/dk/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/dk/opie-eye.ts
+++ b/i18n/dk/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/opie-eye_slave.ts b/i18n/dk/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/dk/opie-eye_slave.ts
+++ b/i18n/dk/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/opie-login.ts b/i18n/dk/opie-login.ts
index 7551ff5..f96e976 100644
--- a/i18n/dk/opie-login.ts
+++ b/i18n/dk/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -49,10 +45,6 @@ accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80,4 +72,51 @@ by an uncaught signal
         <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/dk/opie-sheet.ts b/i18n/dk/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/dk/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/opie-update-symlinks.ts b/i18n/dk/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/dk/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/dk/opieirc.ts b/i18n/dk/opieirc.ts
index 53bd5c4..b510840 100644
--- a/i18n/dk/opieirc.ts
+++ b/i18n/dk/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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: %1</source>
@@ -116,18 +127,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -148,10 +147,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -219,6 +214,103 @@
         <source>No such nickname</source>
         <translation type="unfinished"></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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Colors</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/dk/opiemail.ts b/i18n/dk/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/dk/opiemail.ts
+++ b/i18n/dk/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/dk/opieplayer2.ts b/i18n/dk/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/dk/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/dk/opierec.ts b/i18n/dk/opierec.ts
index c9416cf..dd0423b 100644
--- a/i18n/dk/opierec.ts
+++ b/i18n/dk/opierec.ts
@@ -21,10 +21,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37,14 +33,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,10 +65,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -101,10 +85,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Low Disk Space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -115,10 +95,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -176,5 +152,13 @@ the selected file?</source>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/opimconverter.ts b/i18n/dk/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/dk/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/osearch.ts b/i18n/dk/osearch.ts
index ed1df11..2446d75 100644
--- a/i18n/dk/osearch.ts
+++ b/i18n/dk/osearch.ts
@@ -46,10 +46,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -76,55 +76,55 @@
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
+        <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show</source>
+        <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>execute</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>open in filemanager</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>open with </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/oxygen.ts b/i18n/dk/oxygen.ts
index 19798b5..be515dc 100644
--- a/i18n/dk/oxygen.ts
+++ b/i18n/dk/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/dk/oyatzee.ts b/i18n/dk/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/dk/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/packagemanager.ts b/i18n/dk/packagemanager.ts
index 05d9dba..3b60785 100644
--- a/i18n/dk/packagemanager.ts
+++ b/i18n/dk/packagemanager.ts
@@ -1,11 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
-    <name>DataManager</name>
-</context>
-<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
@@ -47,9 +41,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InputDialog</name>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallDlg</name>
@@ -128,15 +159,6 @@
     </message>
 </context>
 <context>
-    <name>InstallDlgImpl</name>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-</context>
-<context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
@@ -147,119 +169,123 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
+        <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade</source>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download</source>
+        <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply changes</source>
+        <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
+        <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show packages not installed</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show installed packages</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show updated packages</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Packages</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -269,78 +295,86 @@ A blue dot next to the package name indicates that the package is currently inst
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -375,79 +409,201 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Depends</source>
+        <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Reinstall</source>
+        <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Remove</source>
+        <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Overwrite</source>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Errors only</source>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal messages</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Informative messages</source>
+        <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Troubleshooting output</source>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -482,17 +638,17 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-</context>
-<context>
-    <name>QObject</name>
-</context>
-<context>
-    <name>QuestionDlg</name>
-</context>
-<context>
-    <name>SettingsImpl</name>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/powerchord.ts b/i18n/dk/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/dk/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/dk/pyquicklauncher.ts b/i18n/dk/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/dk/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/dk/qpe.ts b/i18n/dk/qpe.ts
index bfab94d..8a704d2 100644
--- a/i18n/dk/qpe.ts
+++ b/i18n/dk/qpe.ts
@@ -242,6 +242,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -261,6 +268,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/dk/quicklauncher.ts b/i18n/dk/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/dk/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/dk/security.ts b/i18n/dk/security.ts
index 584fa09..ca86afe 100644
--- a/i18n/dk/security.ts
+++ b/i18n/dk/security.ts
@@ -70,47 +70,35 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -137,23 +125,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/sfcave-sdl.ts b/i18n/dk/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/dk/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/dk/sfcave.ts b/i18n/dk/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/dk/sfcave.ts
+++ b/i18n/dk/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/dk/simple-icon.ts b/i18n/dk/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/dk/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/simple-main.ts b/i18n/dk/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/dk/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/simple-pim.ts b/i18n/dk/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/dk/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/simple.ts b/i18n/dk/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/dk/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/stocktickertest.ts b/i18n/dk/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/dk/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/sysinfo.ts b/i18n/dk/sysinfo.ts
index 1af3e2d..3528d42 100644
--- a/i18n/dk/sysinfo.ts
+++ b/i18n/dk/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -310,6 +306,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -345,5 +345,9 @@ to this process?</source>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Built against Qt/E </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/tableviewer.ts b/i18n/dk/tableviewer.ts
index 7d41b6f..4570c99 100644
--- a/i18n/dk/tableviewer.ts
+++ b/i18n/dk/tableviewer.ts
@@ -1,16 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
diff --git a/i18n/dk/textedit.ts b/i18n/dk/textedit.ts
index bfe526a..f26a284 100644
--- a/i18n/dk/textedit.ts
+++ b/i18n/dk/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/dk/today.ts b/i18n/dk/today.ts
index 97b11e2..60233b2 100644
--- a/i18n/dk/today.ts
+++ b/i18n/dk/today.ts
@@ -14,11 +14,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins found</source>
+        <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins activated</source>
+        <source>Today</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>
diff --git a/i18n/dk/todolist.ts b/i18n/dk/todolist.ts
index 6351fbb..4cf26d8 100644
--- a/i18n/dk/todolist.ts
+++ b/i18n/dk/todolist.ts
@@ -9,65 +9,68 @@
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Task Editor</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
     <message>
-        <source>Status</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>Opie Todolist</source>
+        <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter Task</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>silent</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>loud</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QWidget</name>
+    <name>Opie</name>
     <message>
-        <source>New from template</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Click here to create a new task.</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -75,46 +78,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
+        <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -131,18 +109,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -157,14 +123,6 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -222,10 +180,6 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/dk/wellenreiter.ts b/i18n/dk/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/dk/wellenreiter.ts
+++ b/i18n/dk/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/dk/zlines.ts b/i18n/dk/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/dk/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/dk/zsafe.ts b/i18n/dk/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/dk/zsafe.ts
+++ b/i18n/dk/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/dk/zsame.ts b/i18n/dk/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/dk/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index 532a26c..5fa1c5e 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -70,10 +70,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
@@ -138,140 +134,131 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
+        <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>to
-</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not move
-</source>
+        <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add To Documents</source>
+        <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select All</source>
+        <source>Bookmark Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
+        <source>Remove Current Directory from Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Directory?</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
+        <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File Exists!</source>
+        <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
+        <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
+        <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy %1 to %2</source>
+        <source>Switch to View 1</source>
         <translation type="unfinished"></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>
+        <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
+        <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <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>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
+        <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>File Search</source>
+        <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
+        <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1?</source>
+        <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
+        <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> As</source>
+        <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AdvancedFm :: </source>
+        <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> kB free</source>
+        <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to View 1</source>
+        <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to View 2</source>
+        <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Yet Implemented</source>
+        <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>Could not copy 
-%1 
-to 
-%2</source>
+        <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/backup.ts b/i18n/en/backup.ts
index 25f4bf6..06c9bc8 100644
--- a/i18n/en/backup.ts
+++ b/i18n/en/backup.ts
@@ -2,10 +2,6 @@
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54,6 +50,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -70,10 +74,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,6 +113,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/en/bartender.ts b/i18n/en/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/en/bartender.ts
+++ b/i18n/en/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/en/bluetooth-manager.ts b/i18n/en/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/en/bluetooth-manager.ts
+++ b/i18n/en/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/en/dagger.ts b/i18n/en/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/en/dagger.ts
+++ b/i18n/en/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/en/launchersettings.ts b/i18n/en/launchersettings.ts
index b54452f..679868d 100644
--- a/i18n/en/launchersettings.ts
+++ b/i18n/en/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/en/libGPRS.ts b/i18n/en/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/en/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libaboutapplet.ts b/i18n/en/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/en/libaboutapplet.ts
+++ b/i18n/en/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/en/libbatteryapplet.ts b/i18n/en/libbatteryapplet.ts
index ea4412a..83f77d4 100644
--- a/i18n/en/libbatteryapplet.ts
+++ b/i18n/en/libbatteryapplet.ts
@@ -6,10 +6,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -46,10 +42,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62,27 +54,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
+        <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining: </source>
+        <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No jacket with battery inserted</source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no data</source>
+        <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/en/libbluetooth.ts b/i18n/en/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/en/libbluetooth.ts
+++ b/i18n/en/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libbrightnessapplet.ts b/i18n/en/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libcable.ts b/i18n/en/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/en/libcable.ts
+++ b/i18n/en/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/libcardmonapplet.ts b/i18n/en/libcardmonapplet.ts
index 441a701..243d4d2 100644
--- a/i18n/en/libcardmonapplet.ts
+++ b/i18n/en/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/libexample_applet.ts b/i18n/en/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/en/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libexample_board.ts b/i18n/en/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/en/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libexample_vpn.ts b/i18n/en/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/en/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libinterfaces.ts b/i18n/en/libinterfaces.ts
index 8239ed9..080cc89 100644
--- a/i18n/en/libinterfaces.ts
+++ b/i18n/en/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/en/libkppp.ts b/i18n/en/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/en/libkppp.ts
+++ b/i18n/en/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/en/liblancard.ts b/i18n/en/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/en/liblancard.ts
+++ b/i18n/en/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/liblockapplet.ts b/i18n/en/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/en/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libmailwrapper.ts b/i18n/en/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/en/libmailwrapper.ts
+++ b/i18n/en/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/en/libmemoryapplet.ts b/i18n/en/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/en/libmemoryapplet.ts
+++ b/i18n/en/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/en/libnetworksettings2.ts b/i18n/en/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/en/libnetworksettings2.ts
+++ b/i18n/en/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/libopiemm2.ts b/i18n/en/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/en/libopiemm2.ts
+++ b/i18n/en/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libopiepim2.ts b/i18n/en/libopiepim2.ts
index 1620e27..98ceba6 100644
--- a/i18n/en/libopiepim2.ts
+++ b/i18n/en/libopiepim2.ts
@@ -215,6 +215,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
@@ -604,6 +707,34 @@ and </source>
         <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>
diff --git a/i18n/en/libopiesecurity2.ts b/i18n/en/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/en/libopiesecurity2.ts
+++ b/i18n/en/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/libopietooth2.ts b/i18n/en/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/en/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libopietooth2applet.ts b/i18n/en/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/en/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libopieui2.ts b/i18n/en/libopieui2.ts
index 0f61518..1f6b6f0 100644
--- a/i18n/en/libopieui2.ts
+++ b/i18n/en/libopieui2.ts
@@ -1,27 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>OTimePickerDialogBase</name>
     <message>
-        <source>FileDialog</source>
+        <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open</source>
+        <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select Directory</source>
+        <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
-        <source>Style</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -29,52 +29,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
-        <source>Time:</source>
+        <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>:</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pick Time:</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OTimePickerDialogBase</source>
+        <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Internal::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Size</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
-        <source>Date</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Name:</source>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/libphasestyle.ts b/i18n/en/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/en/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libppp.ts b/i18n/en/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/en/libppp.ts
+++ b/i18n/en/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/en/libprofile.ts b/i18n/en/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/en/libprofile.ts
+++ b/i18n/en/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/en/libqpickboard.ts b/i18n/en/libqpickboard.ts
index 488fb8f..694b19e 100644
--- a/i18n/en/libqpickboard.ts
+++ b/i18n/en/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libscreenshotapplet.ts b/i18n/en/libscreenshotapplet.ts
index 15bd7b3..ded2f36 100644
--- a/i18n/en/libscreenshotapplet.ts
+++ b/i18n/en/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/libtodayaddressbookplugin.ts b/i18n/en/libtodayaddressbookplugin.ts
index ea68edf..1d2a0d8 100644
--- a/i18n/en/libtodayaddressbookplugin.ts
+++ b/i18n/en/libtodayaddressbookplugin.ts
@@ -10,14 +10,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,10 +51,6 @@ Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/en/libtodayexampleplugin.ts b/i18n/en/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/en/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libtodayweatherplugin.ts b/i18n/en/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/en/libtodayweatherplugin.ts
+++ b/i18n/en/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/libvolumeapplet2.ts b/i18n/en/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libvpn.ts b/i18n/en/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/en/libvpn.ts
+++ b/i18n/en/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/libwebstyle.ts b/i18n/en/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/en/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libwlan.ts b/i18n/en/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/en/libwlan.ts
+++ b/i18n/en/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/en/main-tab.ts b/i18n/en/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/en/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/multiauth.ts b/i18n/en/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/networksettings2.ts b/i18n/en/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/en/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/opie-console.ts b/i18n/en/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/en/opie-console.ts
+++ b/i18n/en/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/en/opie-eye.ts b/i18n/en/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/en/opie-eye.ts
+++ b/i18n/en/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/opie-eye_slave.ts b/i18n/en/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/en/opie-eye_slave.ts
+++ b/i18n/en/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/opie-login.ts b/i18n/en/opie-login.ts
index 0ce0332..cb42a27 100644
--- a/i18n/en/opie-login.ts
+++ b/i18n/en/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -75,8 +71,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/en/opie-sheet.ts b/i18n/en/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/en/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/opie-update-symlinks.ts b/i18n/en/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/opieirc.ts b/i18n/en/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/en/opieirc.ts
+++ b/i18n/en/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/en/opiemail.ts b/i18n/en/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/en/opiemail.ts
+++ b/i18n/en/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/en/opieplayer2.ts b/i18n/en/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/en/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/en/opierec.ts b/i18n/en/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/en/opierec.ts
+++ b/i18n/en/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/opimconverter.ts b/i18n/en/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/en/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/osearch.ts b/i18n/en/osearch.ts
index e20a0f4..97ed663 100644
--- a/i18n/en/osearch.ts
+++ b/i18n/en/osearch.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -96,35 +96,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show completed tasks</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/oxygen.ts b/i18n/en/oxygen.ts
index 95ea62e..8a90e8e 100644
--- a/i18n/en/oxygen.ts
+++ b/i18n/en/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/en/oyatzee.ts b/i18n/en/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/en/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/packagemanager.ts b/i18n/en/packagemanager.ts
index f6ddc91..d86ecec 100644
--- a/i18n/en/packagemanager.ts
+++ b/i18n/en/packagemanager.ts
@@ -1,11 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
-    <name>DataManager</name>
-</context>
-<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
@@ -47,9 +41,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InputDialog</name>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallDlg</name>
@@ -128,15 +159,6 @@
     </message>
 </context>
 <context>
-    <name>InstallDlgImpl</name>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-</context>
-<context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
@@ -147,119 +169,123 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
+        <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade</source>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
+        <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply changes</source>
+        <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show packages not installed</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show installed packages</source>
+        <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show updated packages</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Packages</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -269,78 +295,86 @@ A blue dot next to the package name indicates that the package is currently inst
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -375,79 +409,201 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Depends</source>
+        <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Reinstall</source>
+        <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Remove</source>
+        <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Overwrite</source>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Errors only</source>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal messages</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Informative messages</source>
+        <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Troubleshooting output</source>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -482,17 +638,17 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-</context>
-<context>
-    <name>QObject</name>
-</context>
-<context>
-    <name>QuestionDlg</name>
-</context>
-<context>
-    <name>SettingsImpl</name>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/powerchord.ts b/i18n/en/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/en/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/en/pyquicklauncher.ts b/i18n/en/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index e4cc8e0..ed41643 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -242,6 +242,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -261,6 +268,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/en/security.ts b/i18n/en/security.ts
index 584fa09..ca86afe 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -70,47 +70,35 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -137,23 +125,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/sfcave-sdl.ts b/i18n/en/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/sfcave.ts b/i18n/en/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/en/sfcave.ts
+++ b/i18n/en/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/simple-icon.ts b/i18n/en/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/en/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/simple-main.ts b/i18n/en/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/en/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/simple-pim.ts b/i18n/en/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/en/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/simple.ts b/i18n/en/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/en/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/stocktickertest.ts b/i18n/en/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/en/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/sysinfo.ts b/i18n/en/sysinfo.ts
index 6100afb..10f2b46 100644
--- a/i18n/en/sysinfo.ts
+++ b/i18n/en/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -310,6 +306,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -345,5 +345,9 @@ to this process?</source>
         <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/en/tableviewer.ts b/i18n/en/tableviewer.ts
index 7d41b6f..4570c99 100644
--- a/i18n/en/tableviewer.ts
+++ b/i18n/en/tableviewer.ts
@@ -1,16 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
diff --git a/i18n/en/textedit.ts b/i18n/en/textedit.ts
index f6a71b7..ef72df2 100644
--- a/i18n/en/textedit.ts
+++ b/i18n/en/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
 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>
diff --git a/i18n/en/today.ts b/i18n/en/today.ts
index f3b8ffb..5d7b39b 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -6,10 +6,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21,6 +17,18 @@
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Today</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>TodayBase</name>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index 5887338..4c1790b 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -9,65 +9,68 @@
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Alarms</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
     <message>
-        <source>Status</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Task Editor</source>
+        <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>Enter Task</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>silent</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>loud</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Todolist</source>
+        <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QWidget</name>
+    <name>Opie</name>
     <message>
-        <source>New from template</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Click here to create a new task.</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -75,42 +78,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
+        <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -127,18 +109,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -153,10 +123,6 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -182,10 +148,6 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -194,10 +156,6 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -210,10 +168,6 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/en/wellenreiter.ts b/i18n/en/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/en/wellenreiter.ts
+++ b/i18n/en/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/en/zlines.ts b/i18n/en/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/en/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/zsafe.ts b/i18n/en/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/en/zsafe.ts
+++ b/i18n/en/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/zsame.ts b/i18n/en/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/en/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index f80798a..a2ebab3 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Ese directorio no existe</translation>
+        <translation type="obsolete">Ese directorio no existe</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -148,19 +148,19 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>No pude copiar
+        <translation type="obsolete">No pude copiar
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>a
+        <translation type="obsolete">a
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>No puede mover
+        <translation type="obsolete">No puede mover
 </translation>
     </message>
     <message>
@@ -178,7 +178,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>¿Confirma el borrado
+        <translation type="obsolete">¿Confirma el borrado
 de los ficheros %1?</translation>
     </message>
     <message>
@@ -188,7 +188,7 @@ de los ficheros %1?</translation>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>¿Confirma la copia
+        <translation type="obsolete">¿Confirma la copia
 de los ficheros %1?</translation>
     </message>
     <message>
@@ -198,29 +198,29 @@ de los ficheros %1?</translation>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 existe. ¿Lo sobrescribo?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation> ya existe.
+        <translation type="obsolete"> ya existe.
 ¿Seguro que quiere borrarlo?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 existe. ¿Lo sobreescribo?</translation>
+        <translation type="obsolete">%1 existe. ¿Lo sobreescribo?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>No pude copiar %1 a %2</translation>
+        <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>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 copyright 2002-2003 por
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 y está bajo licencia GPL
@@ -242,7 +242,7 @@ y está bajo licencia GPL
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>No pude borrar el directorio actual
+        <translation type="obsolete">No pude borrar el directorio actual
 de los favoritos.
 ¡No está marcado como favorito!</translation>
     </message>
@@ -253,13 +253,13 @@ de los favoritos.
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>¿Seguro que quiere borrar %1
+        <translation type="obsolete">¿Seguro que quiere borrar %1
 y todo su contenido?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>¿Confirma el borrado
+        <translation type="obsolete">¿Confirma el borrado
 de %1?</translation>
     </message>
     <message>
@@ -283,10 +283,67 @@ de %1?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
+        <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>
diff --git a/i18n/es/backup.ts b/i18n/es/backup.ts
index 6f28060..96d5c4a 100644
--- a/i18n/es/backup.ts
+++ b/i18n/es/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Copiar y restaurar... trabajando...</translation>
+        <translation type="obsolete">Copiar y restaurar... trabajando...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -63,6 +63,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -80,7 +88,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Guardar en</translation>
+        <translation type="obsolete">Guardar en</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -126,6 +134,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/es/bartender.ts b/i18n/es/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/es/bartender.ts
+++ b/i18n/es/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/es/bluetooth-manager.ts b/i18n/es/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/es/bluetooth-manager.ts
+++ b/i18n/es/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/es/dagger.ts b/i18n/es/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/es/dagger.ts
+++ b/i18n/es/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/es/launchersettings.ts b/i18n/es/launchersettings.ts
index fb4fa19..f40d14d 100644
--- a/i18n/es/launchersettings.ts
+++ b/i18n/es/launchersettings.ts
@@ -176,6 +176,14 @@
         <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>
diff --git a/i18n/es/libGPRS.ts b/i18n/es/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/es/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libaboutapplet.ts b/i18n/es/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/es/libaboutapplet.ts
+++ b/i18n/es/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/es/libbatteryapplet.ts b/i18n/es/libbatteryapplet.ts
index 6ef6522..f1ff417 100644
--- a/i18n/es/libbatteryapplet.ts
+++ b/i18n/es/libbatteryapplet.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Porcentaje batería restante</translation>
+        <translation type="obsolete">Porcentaje batería restante</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Duración batería restante</translation>
+        <translation type="obsolete">Duración batería restante</translation>
     </message>
     <message>
         <source>Battery status</source>
@@ -71,11 +71,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Porcentaje batería restante:</translation>
+        <translation type="obsolete">Porcentaje batería restante:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Duración batería restante:</translation>
+        <translation type="obsolete">Duración batería restante:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -86,11 +86,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/es/libbluetooth.ts b/i18n/es/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/es/libbluetooth.ts
+++ b/i18n/es/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libbrightnessapplet.ts b/i18n/es/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libcable.ts b/i18n/es/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/es/libcable.ts
+++ b/i18n/es/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/libcardmonapplet.ts b/i18n/es/libcardmonapplet.ts
index 87b7c2e..ecfbc47 100644
--- a/i18n/es/libcardmonapplet.ts
+++ b/i18n/es/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Eject card 1: %1</source>
         <translation>Expulsar tarjeta 1: %1</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libexample_applet.ts b/i18n/es/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/es/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libexample_board.ts b/i18n/es/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/es/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libexample_vpn.ts b/i18n/es/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/es/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libinterfaces.ts b/i18n/es/libinterfaces.ts
index 48fb2c5..976c5e1 100644
--- a/i18n/es/libinterfaces.ts
+++ b/i18n/es/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Reiniciando interfaz</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/es/libkppp.ts b/i18n/es/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/es/libkppp.ts
+++ b/i18n/es/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/es/liblancard.ts b/i18n/es/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/es/liblancard.ts
+++ b/i18n/es/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/liblockapplet.ts b/i18n/es/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/es/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libmailwrapper.ts b/i18n/es/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/es/libmailwrapper.ts
+++ b/i18n/es/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/es/libmemoryapplet.ts b/i18n/es/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/es/libmemoryapplet.ts
+++ b/i18n/es/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/es/libnetworksettings2.ts b/i18n/es/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/es/libnetworksettings2.ts
+++ b/i18n/es/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/libopiemm2.ts b/i18n/es/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/es/libopiemm2.ts
+++ b/i18n/es/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libopiepim2.ts b/i18n/es/libopiepim2.ts
index 34e293e..9699a2b 100644
--- a/i18n/es/libopiepim2.ts
+++ b/i18n/es/libopiepim2.ts
@@ -597,6 +597,109 @@ y </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1036,6 +1139,34 @@ y </translation>
         <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>
diff --git a/i18n/es/libopiesecurity2.ts b/i18n/es/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/es/libopiesecurity2.ts
+++ b/i18n/es/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/libopietooth2.ts b/i18n/es/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/es/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libopietooth2applet.ts b/i18n/es/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/es/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libopieui2.ts b/i18n/es/libopieui2.ts
index 5e941f4..854ddfe 100644
--- a/i18n/es/libopieui2.ts
+++ b/i18n/es/libopieui2.ts
@@ -112,19 +112,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">Diálogo Fichero</translation>
+        <translation type="obsolete">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Abrir</translation>
+        <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Guardar</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Guardar</translation>
     </message>
 </context>
 <context>
@@ -172,15 +168,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Tamaño</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
@@ -449,15 +445,19 @@ y </translation>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">Diálogo Fichero</translation>
+        <translation type="unfinished">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
+        <translation type="unfinished">Guardar</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -471,15 +471,15 @@ y </translation>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
+        <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/es/libphasestyle.ts b/i18n/es/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/es/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libppp.ts b/i18n/es/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/es/libppp.ts
+++ b/i18n/es/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/es/libprofile.ts b/i18n/es/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/es/libprofile.ts
+++ b/i18n/es/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/es/libqpickboard.ts b/i18n/es/libqpickboard.ts
index 7eef6c6..eb06783 100644
--- a/i18n/es/libqpickboard.ts
+++ b/i18n/es/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libscreenshotapplet.ts b/i18n/es/libscreenshotapplet.ts
index 3273a9e..0972bbd 100644
--- a/i18n/es/libscreenshotapplet.ts
+++ b/i18n/es/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation>Conexión fallida a %1.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libtodayaddressbookplugin.ts b/i18n/es/libtodayaddressbookplugin.ts
index c38da0c..82b2c50 100644
--- a/i18n/es/libtodayaddressbookplugin.ts
+++ b/i18n/es/libtodayaddressbookplugin.ts
@@ -11,11 +11,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Cortar línea tras X caracteres: </translation>
+        <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>Después de cuantos caracteres la información sobre la tarea debe ser cortada</translation>
+        <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>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="unfinished">Para activar configuración: ¡Reinicie la aplicación!</translation>
+        <translation type="obsolete">Para activar configuración: ¡Reinicie la aplicación!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
diff --git a/i18n/es/libtodayexampleplugin.ts b/i18n/es/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/es/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libtodayweatherplugin.ts b/i18n/es/libtodayweatherplugin.ts
index 00be11a..ca37a4c 100644
--- a/i18n/es/libtodayweatherplugin.ts
+++ b/i18n/es/libtodayweatherplugin.ts
@@ -107,11 +107,15 @@ Pres: </translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation>hPa</translation>
+        <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/libvolumeapplet2.ts b/i18n/es/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libvpn.ts b/i18n/es/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/es/libvpn.ts
+++ b/i18n/es/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/libwebstyle.ts b/i18n/es/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/es/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libwlan.ts b/i18n/es/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/es/libwlan.ts
+++ b/i18n/es/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/es/main-tab.ts b/i18n/es/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/es/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/multiauth.ts b/i18n/es/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/networksettings2.ts b/i18n/es/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/es/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/opie-console.ts b/i18n/es/opie-console.ts
index ea03f7f..ee9bf26 100644
--- a/i18n/es/opie-console.ts
+++ b/i18n/es/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation>Editar tecla</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation>9600 baudios</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 baudios</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 baudios</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 baudios</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <source>Save Profile</source>
         <translation>Guardar 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>
@@ -746,7 +792,7 @@
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Falló la marcación del número.</translation>
+        <translation type="obsolete">Falló la marcación del número.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -784,6 +830,14 @@
         <source>Dismiss</source>
         <translation>Olvidar</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>
@@ -804,19 +858,19 @@
     </message>
     <message>
         <source>Font size</source>
-        <translation>Tamaño letra</translation>
+        <translation type="obsolete">Tamaño letra</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>pequeña</translation>
+        <translation type="obsolete">pequeña</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>mediana</translation>
+        <translation type="obsolete">mediana</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>grande</translation>
+        <translation type="obsolete">grande</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/es/opie-eye.ts b/i18n/es/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/es/opie-eye.ts
+++ b/i18n/es/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/opie-eye_slave.ts b/i18n/es/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/es/opie-eye_slave.ts
+++ b/i18n/es/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/opie-login.ts b/i18n/es/opie-login.ts
index 3ed76f7..6961a38 100644
--- a/i18n/es/opie-login.ts
+++ b/i18n/es/opie-login.ts
@@ -9,7 +9,7 @@ precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bienvenido a Opie</translation>
+        <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
@@ -97,8 +97,51 @@ una señal no capturada
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/es/opie-sheet.ts b/i18n/es/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/es/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/opie-update-symlinks.ts b/i18n/es/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/opieirc.ts b/i18n/es/opieirc.ts
index ffd48f8..044b2b8 100644
--- a/i18n/es/opieirc.ts
+++ b/i18n/es/opieirc.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
@@ -58,6 +58,21 @@
     </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>
@@ -125,7 +140,7 @@
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Cambio de apodo de una persona desconocida</translation>
+        <translation type="obsolete">Cambio de apodo de una persona desconocida</translation>
     </message>
     <message>
         <source> has quit </source>
@@ -149,7 +164,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>Recibido un CTCP VERSION de </translation>
+        <translation type="obsolete">Recibido un CTCP VERSION de </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -249,16 +264,113 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>Ahora es conocido como %1</translation>
+        <translation type="obsolete">Ahora es conocido como %1</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 es ahora conocido como %2</translation>
+        <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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -355,7 +467,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>Puerto requerido</translation>
+        <translation type="obsolete">Puerto requerido</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -363,7 +475,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>Nombre real requerido</translation>
+        <translation type="obsolete">Nombre real requerido</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -417,7 +529,7 @@ de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Conexión a</translation>
+        <translation type="obsolete">Conexión a</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -427,6 +539,25 @@ de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
         <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>
@@ -506,6 +637,14 @@ de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
         <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>
@@ -553,4 +692,31 @@ de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
         <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 242ccfc..99637a7 100644
--- a/i18n/es/opiemail.ts
+++ b/i18n/es/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/es/opieplayer2.ts b/i18n/es/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/es/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/es/opierec.ts b/i18n/es/opierec.ts
index 3f66985..f07079f 100644
--- a/i18n/es/opierec.ts
+++ b/i18n/es/opierec.ts
@@ -114,7 +114,7 @@ no ha sido reconocida</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>segundos</translation>
+        <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;
@@ -182,15 +182,15 @@ el fichero seleccionado?</translation>
     </message>
     <message>
         <source>Rec</source>
-        <translation>Gra</translation>
+        <translation type="obsolete">Gra</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>Lugar</translation>
+        <translation type="obsolete">Lugar</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Fecha</translation>
+        <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
@@ -206,14 +206,18 @@ el fichero seleccionado?</translation>
     </message>
     <message>
         <source>Stop</source>
-        <translation>Parar</translation>
+        <translation type="obsolete">Parar</translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/opimconverter.ts b/i18n/es/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/es/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/osearch.ts b/i18n/es/osearch.ts
index d3bff16..774377d 100644
--- a/i18n/es/osearch.ts
+++ b/i18n/es/osearch.ts
@@ -35,7 +35,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Sensible may/min</translation>
+        <translation type="obsolete">Sensible may/min</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -85,6 +85,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -117,15 +121,15 @@
     </message>
     <message>
         <source>show completed tasks</source>
-        <translation>mostrar tareas completadas</translation>
+        <translation type="obsolete">mostrar tareas completadas</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>mostrar sucesos pasados</translation>
+        <translation type="obsolete">mostrar sucesos pasados</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>buscar en fechas</translation>
+        <translation type="obsolete">buscar en fechas</translation>
     </message>
     <message>
         <source>File: </source>
@@ -141,11 +145,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>buscar contenido</translation>
+        <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 9dea650..28fbcff 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>Composición elemental (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/es/oyatzee.ts b/i18n/es/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/es/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/packagemanager.ts b/i18n/es/packagemanager.ts
index 27a2a84..244c904 100644
--- a/i18n/es/packagemanager.ts
+++ b/i18n/es/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished">Instalado en el dispositivo en:</translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -376,7 +416,7 @@
     </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>
+        <translation type="obsolete">Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -384,7 +424,7 @@
     </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>
+        <translation type="obsolete">Pulse aquí para actualizar todos los paquetes instalados si se dispone de una nueva versión.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -392,7 +432,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
+        <translation type="obsolete">Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -400,7 +440,7 @@
     </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>
+        <translation type="obsolete">Pulse aquí para instalar, borrar o renovar los paquetes instalados actualmente.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -412,7 +452,7 @@
     </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>
+        <translation type="obsolete">Pulse aquí para mostrar los paquetes disponibles que no han sido instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -420,7 +460,7 @@
     </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>
+        <translation type="obsolete">Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -428,7 +468,7 @@
     </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>
+        <translation type="obsolete">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>
@@ -452,7 +492,7 @@
     </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>
+        <translation type="obsolete">Pulse aquí para buscar texto en el nombre de los paquetes.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -460,7 +500,7 @@
     </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>
+        <translation type="obsolete">Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -480,11 +520,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Pulse aquí para configurar esta aplicación.</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -642,84 +682,140 @@ Opie/Qtopia está corriendo!
         <translation type="obsolete">Actualizando lanzador...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished">Gestor de Paquetes</translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished">Gestor de Paquetes</translation>
+        <source>Install local package</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -755,23 +851,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Servidor</translation>
+        <translation type="obsolete">Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Nombre:</translation>
+        <translation type="obsolete">Nombre:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Dirección:</translation>
+        <translation type="obsolete">Dirección:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Servidor activo</translation>
+        <translation type="obsolete">Servidor activo</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Actualizar</translation>
+        <translation type="obsolete">Actualizar</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -829,6 +925,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Salida de soluciones</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nombre:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Posición:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nombre:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Dirección:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -861,6 +1099,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/es/powerchord.ts b/i18n/es/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/es/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/es/pyquicklauncher.ts b/i18n/es/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index 03fda50..36c0f5e 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -388,6 +388,13 @@ Por favor cárguela.</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>
@@ -407,6 +414,13 @@ Por favor cárguela.</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>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 5c5be3c..176457c 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -70,40 +70,32 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -113,6 +105,26 @@ You can only select an actually configured user.</source>
         <source>None</source>
         <translation type="unfinished">Ninguna</translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -137,23 +149,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/sfcave-sdl.ts b/i18n/es/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/sfcave.ts b/i18n/es/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/es/sfcave.ts
+++ b/i18n/es/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/simple-icon.ts b/i18n/es/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/es/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/simple-main.ts b/i18n/es/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/es/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/simple-pim.ts b/i18n/es/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/es/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/simple.ts b/i18n/es/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/es/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/stocktickertest.ts b/i18n/es/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/es/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index 4ff30e2..2426b1f 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -354,6 +350,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -397,5 +397,9 @@ to this process?</source>
         <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/es/tableviewer.ts b/i18n/es/tableviewer.ts
index a00b6f1..308cd84 100644
--- a/i18n/es/tableviewer.ts
+++ b/i18n/es/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() No puedo dar un valor por omisión al tipo %1, Clave no añadida.</translation>
+        <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>DataElem::setField(%1, %2) No encontrado tipo válido</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) No encontrado tipo válido</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index 3546cc3..af727be 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -206,6 +206,10 @@ 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>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index c7d2fcb..9ed5b37 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Hoy</translation>
+        <translation type="unfinished">Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>No encontré módulos</translation>
+        <translation type="obsolete">No encontré módulos</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -25,6 +25,14 @@
         <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>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index ad0e93a..25c72f3 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -9,6 +9,29 @@
         <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>
@@ -34,6 +57,17 @@
     </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>
@@ -53,46 +87,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Tareas Opie</translation>
+        <translation type="obsolete">Tareas Opie</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Nuevo desde plantilla</translation>
+        <translation type="obsolete">Nuevo desde plantilla</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nueva tarea</translation>
+        <translation type="obsolete">Nueva tarea</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Pulse aquí para crear una nueva tarea.</translation>
+        <translation type="obsolete">Pulse aquí para crear una nueva tarea.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Editar Tarea</translation>
+        <translation type="obsolete">Editar Tarea</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Pulse aquí para modificar la tarea actual.</translation>
+        <translation type="obsolete">Pulse aquí para modificar la tarea actual.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Ver tarea</translation>
+        <translation type="obsolete">Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Eliminar...</translation>
+        <translation type="obsolete">Eliminar...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Pulse aquí para borrar la tarea actual.</translation>
+        <translation type="obsolete">Pulse aquí para borrar la tarea actual.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Borrar todo...</translation>
+        <translation type="obsolete">Borrar todo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,15 +134,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>Emitir</translation>
+        <translation type="obsolete">Emitir</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Pulse aquí para enviar la tarea actual a otro dispositivo.</translation>
+        <translation type="obsolete">Pulse aquí para enviar la tarea actual a otro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Buscar</translation>
+        <translation type="obsolete">Buscar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -128,15 +162,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Datos</translation>
+        <translation type="obsolete">Datos</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Categoría</translation>
+        <translation type="obsolete">Categoría</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opciones</translation>
+        <translation type="obsolete">Opciones</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -160,7 +194,7 @@ La lista muestra la siguiente información:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Todas</translation>
+        <translation type="obsolete">Todas</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -198,7 +232,7 @@ e inténtelo de nuevo.
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>En blanco</translation>
+        <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>
@@ -210,7 +244,7 @@ e inténtelo de nuevo.
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplicar</translation>
+        <translation type="obsolete">Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
@@ -230,7 +264,7 @@ e inténtelo de nuevo.
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Configurar Platillas</translation>
+        <translation type="obsolete">Configurar Platillas</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/es/wellenreiter.ts b/i18n/es/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/es/wellenreiter.ts
+++ b/i18n/es/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/es/zlines.ts b/i18n/es/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/es/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/zsafe.ts b/i18n/es/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/es/zsafe.ts
+++ b/i18n/es/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/zsame.ts b/i18n/es/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/es/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index ae9d7e4..f4ba524 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -72,7 +72,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Ce répertoire n&apos;existe pas</translation>
+        <translation type="obsolete">Ce répertoire n&apos;existe pas</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -149,18 +149,18 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Impossible de copier
+        <translation type="obsolete">Impossible de copier
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>vers</translation>
+        <translation type="obsolete">vers</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Impossible de déplacer</translation>
+        <translation type="obsolete">Impossible de déplacer</translation>
     </message>
     <message>
         <source>Add To Documents</source>
@@ -177,7 +177,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Confirmer la suppression
+        <translation type="obsolete">Confirmer la suppression
 du fichier %1 ?</translation>
     </message>
     <message>
@@ -187,7 +187,7 @@ du fichier %1 ?</translation>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Confirmer la copie
+        <translation type="obsolete">Confirmer la copie
 du fichier %1 ?</translation>
     </message>
     <message>
@@ -197,23 +197,23 @@ du fichier %1 ?</translation>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <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>Existe déjà.
+        <translation type="obsolete">Existe déjà.
 Voulez-vous vraiment l&apos;effacer ?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 existe déjà.
+        <translation type="obsolete">%1 existe déjà.
 Confirmer son écrasement ?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Impossible de copier
+        <translation type="obsolete">Impossible de copier
 %1 vers %2</translation>
     </message>
     <message>
@@ -221,7 +221,7 @@ Confirmer son écrasement ?</translation>
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation>Gestionnaire de fichier Explorateur
+        <translation type="obsolete">Gestionnaire de fichier Explorateur
 Copyright 2002-2003
 L.J.Potter &lt;llornkcor@handhelds.org&gt;
 Sous licence GPL</translation>
@@ -242,7 +242,7 @@ Sous licence GPL</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Impossible d&apos;effacer le répertoire
+        <translation type="obsolete">Impossible d&apos;effacer le répertoire
 courant des favoris.
 Il ne fait pas partie des favoris !</translation>
     </message>
@@ -253,14 +253,14 @@ Il ne fait pas partie des favoris !</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Voulez-vous réellement
+        <translation type="obsolete">Voulez-vous réellement
 supprimer %1
 et tout son contenu ?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Confirmer suppression de
+        <translation type="obsolete">Confirmer suppression de
 %1 ?</translation>
     </message>
     <message>
@@ -288,11 +288,75 @@ et tout son contenu ?</translation>
 %1 
 to 
 %2</source>
-        <translation>Impossible de copier
+        <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>
diff --git a/i18n/fr/backup.ts b/i18n/fr/backup.ts
index e6f16e2..b0332d4 100644
--- a/i18n/fr/backup.ts
+++ b/i18n/fr/backup.ts
@@ -4,7 +4,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Sauvegarde/Restauration... en cours...</translation>
+        <translation type="obsolete">Sauvegarde/Restauration... en cours...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -66,6 +66,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -83,7 +91,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Enregistrer sous</translation>
+        <translation type="obsolete">Enregistrer sous</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -129,6 +137,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/fr/bartender.ts b/i18n/fr/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/fr/bartender.ts
+++ b/i18n/fr/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/fr/bluetooth-manager.ts b/i18n/fr/bluetooth-manager.ts
index bb72a08..6c6cc61 100644
--- a/i18n/fr/bluetooth-manager.ts
+++ b/i18n/fr/bluetooth-manager.ts
@@ -91,7 +91,7 @@
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
-        <translation>Conf Bluetooth de base</translation>
+        <translation type="obsolete">Conf Bluetooth de base</translation>
     </message>
     <message>
         <source>Default Passkey</source>
@@ -129,6 +129,10 @@
         <source>Status Label</source>
         <translation>Etiquette de statut</translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/fr/dagger.ts b/i18n/fr/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/fr/dagger.ts
+++ b/i18n/fr/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/fr/launchersettings.ts b/i18n/fr/launchersettings.ts
index 49d3c6f..f02ed88 100644
--- a/i18n/fr/launchersettings.ts
+++ b/i18n/fr/launchersettings.ts
@@ -196,6 +196,14 @@
         <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>
diff --git a/i18n/fr/libGPRS.ts b/i18n/fr/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/fr/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libaboutapplet.ts b/i18n/fr/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/fr/libaboutapplet.ts
+++ b/i18n/fr/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/fr/libbatteryapplet.ts b/i18n/fr/libbatteryapplet.ts
index e1a463a..1bcacc3 100644
--- a/i18n/fr/libbatteryapplet.ts
+++ b/i18n/fr/libbatteryapplet.ts
@@ -8,7 +8,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Pourcentage de batterie chargé </translation>
+        <translation type="obsolete">Pourcentage de batterie chargé </translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -48,7 +48,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Durée de batterie restante </translation>
+        <translation type="obsolete">Durée de batterie restante </translation>
     </message>
     <message>
         <source>Close</source>
@@ -72,11 +72,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Pourcentage de batterie chargé : </translation>
+        <translation type="obsolete">Pourcentage de batterie chargé : </translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Temps restant de la batterie : </translation>
+        <translation type="obsolete">Temps restant de la batterie : </translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -88,11 +88,28 @@
     </message>
     <message>
         <source>Ipaq  </source>
-        <translation>iPaq </translation>
+        <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/libbluetooth.ts b/i18n/fr/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/fr/libbluetooth.ts
+++ b/i18n/fr/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libbrightnessapplet.ts b/i18n/fr/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libcable.ts b/i18n/fr/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/fr/libcable.ts
+++ b/i18n/fr/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/libcardmonapplet.ts b/i18n/fr/libcardmonapplet.ts
index 2a1dda5..841aa5a 100644
--- a/i18n/fr/libcardmonapplet.ts
+++ b/i18n/fr/libcardmonapplet.ts
@@ -30,5 +30,13 @@
         <source>Eject card 1: %1</source>
         <translation>Ejecter la carte 1 : %1</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/libexample_applet.ts b/i18n/fr/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/fr/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libexample_board.ts b/i18n/fr/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/fr/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libexample_vpn.ts b/i18n/fr/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/fr/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libinterfaces.ts b/i18n/fr/libinterfaces.ts
index a06fb7e..0ac137a 100644
--- a/i18n/fr/libinterfaces.ts
+++ b/i18n/fr/libinterfaces.ts
@@ -1,6 +1,13 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Redémarrage de l&apos;interface</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/fr/libkppp.ts b/i18n/fr/libkppp.ts
index 135c80d..d966a99 100644
--- a/i18n/fr/libkppp.ts
+++ b/i18n/fr/libkppp.ts
@@ -384,6 +384,10 @@ nouveaux paramètres</translation>
         <source>You must enter a unique device name</source>
         <translation>Vous devez utiliser un nom de dispositif unique</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/fr/liblancard.ts b/i18n/fr/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/fr/liblancard.ts
+++ b/i18n/fr/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/liblockapplet.ts b/i18n/fr/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/fr/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libmailwrapper.ts b/i18n/fr/libmailwrapper.ts
index 9687fb3..7887fd2 100644
--- a/i18n/fr/libmailwrapper.ts
+++ b/i18n/fr/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation>Erreur lors de la suppression du message %1</translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/fr/libmemoryapplet.ts b/i18n/fr/libmemoryapplet.ts
index 96d683c..65a2ff8 100644
--- a/i18n/fr/libmemoryapplet.ts
+++ b/i18n/fr/libmemoryapplet.ts
@@ -124,7 +124,7 @@ La mémoire (i.e RAM) est divisée en catégories comme suit :
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation>2 Mb, 4 Mb, 6 Mb, 8 Mb</translation>
+        <translation type="obsolete">2 Mb, 4 Mb, 6 Mb, 8 Mb</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
@@ -162,5 +162,9 @@ La mémoire (i.e RAM) est divisée en catégories comme suit :
         <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/libnetworksettings2.ts b/i18n/fr/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/fr/libnetworksettings2.ts
+++ b/i18n/fr/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/libopiemm2.ts b/i18n/fr/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/fr/libopiemm2.ts
+++ b/i18n/fr/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libopiepim2.ts b/i18n/fr/libopiepim2.ts
index b89575c..877dd1d 100644
--- a/i18n/fr/libopiepim2.ts
+++ b/i18n/fr/libopiepim2.ts
@@ -614,6 +614,109 @@ et </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1055,6 +1158,34 @@ plusieurs jours</translation>
         <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>
diff --git a/i18n/fr/libopiesecurity2.ts b/i18n/fr/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/fr/libopiesecurity2.ts
+++ b/i18n/fr/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/libopietooth2.ts b/i18n/fr/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/fr/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libopietooth2applet.ts b/i18n/fr/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/fr/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libopieui2.ts b/i18n/fr/libopieui2.ts
index bb36c35..e43f2a2 100644
--- a/i18n/fr/libopieui2.ts
+++ b/i18n/fr/libopieui2.ts
@@ -125,19 +125,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">Sélection fichier</translation>
+        <translation type="obsolete">Sélection fichier</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Ouvrir</translation>
+        <translation type="obsolete">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Enregistrer</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Enregistrer</translation>
     </message>
 </context>
 <context>
@@ -185,15 +181,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Style</translation>
+        <translation type="obsolete">Style</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Taille</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Le renard brun saute au dessus du chien paresseux</translation>
     </message>
 </context>
 <context>
@@ -521,15 +517,19 @@ et </translation>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">Sélection fichier</translation>
+        <translation type="unfinished">Sélection fichier</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Ouvrir</translation>
+        <translation type="unfinished">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Enregistrer</translation>
+        <translation type="unfinished">Enregistrer</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -543,15 +543,15 @@ et </translation>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Style</translation>
+        <translation type="unfinished">Style</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Taille</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">Le renard brun saute au dessus du chien paresseux</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/libphasestyle.ts b/i18n/fr/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/fr/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libppp.ts b/i18n/fr/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/fr/libppp.ts
+++ b/i18n/fr/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/fr/libprofile.ts b/i18n/fr/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/fr/libprofile.ts
+++ b/i18n/fr/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/fr/libqpickboard.ts b/i18n/fr/libqpickboard.ts
index 4c83d79..969f7f5 100644
--- a/i18n/fr/libqpickboard.ts
+++ b/i18n/fr/libqpickboard.ts
@@ -1,10 +1,90 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libscreenshotapplet.ts b/i18n/fr/libscreenshotapplet.ts
index 1f71542..3b035aa 100644
--- a/i18n/fr/libscreenshotapplet.ts
+++ b/i18n/fr/libscreenshotapplet.ts
@@ -46,5 +46,13 @@
         <source>Connection to %1 failed.</source>
         <translation>La connexion à %1 a échoué.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodayaddressbookplugin.ts b/i18n/fr/libtodayaddressbookplugin.ts
index e0768bd..e69b102 100644
--- a/i18n/fr/libtodayaddressbookplugin.ts
+++ b/i18n/fr/libtodayaddressbookplugin.ts
@@ -12,11 +12,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Couper la ligne après X caractères:</translation>
+        <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>Après combien de caractères doit-être coupé l&apos;information sur la tâche</translation>
+        <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>
@@ -28,7 +28,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Pour activer les changement: Redémarrez l&apos;application !</translation>
+        <translation type="obsolete">Pour activer les changement: Redémarrez l&apos;application !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
diff --git a/i18n/fr/libtodayexampleplugin.ts b/i18n/fr/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/fr/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libtodayweatherplugin.ts b/i18n/fr/libtodayweatherplugin.ts
index 6d924f6..c3b37c0 100644
--- a/i18n/fr/libtodayweatherplugin.ts
+++ b/i18n/fr/libtodayweatherplugin.ts
@@ -107,11 +107,15 @@ Pres: </source>
     </message>
     <message>
         <source> hPa</source>
-        <translation>hPa</translation>
+        <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/libvolumeapplet2.ts b/i18n/fr/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libvpn.ts b/i18n/fr/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/fr/libvpn.ts
+++ b/i18n/fr/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/libwebstyle.ts b/i18n/fr/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/fr/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libwlan.ts b/i18n/fr/libwlan.ts
index c60b7a5..da1620c 100644
--- a/i18n/fr/libwlan.ts
+++ b/i18n/fr/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -195,9 +192,14 @@
         <source>Signal</source>
         <translation type="obsolete">Signal</translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
+    <message>
+        <source>SSID</source>
+        <translation type="obsolete">SSID</translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="obsolete">Canal</translation>
+    </message>
 </context>
 <context>
     <name>WlanInfo</name>
diff --git a/i18n/fr/main-tab.ts b/i18n/fr/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/fr/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/multiauth.ts b/i18n/fr/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/networksettings2.ts b/i18n/fr/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/fr/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/opie-console.ts b/i18n/fr/opie-console.ts
index 9b293c5..6db2b32 100644
--- a/i18n/fr/opie-console.ts
+++ b/i18n/fr/opie-console.ts
@@ -265,6 +265,28 @@ de DTR (0=non)</translation>
         <source>Edit Key</source>
         <translation>Editer touche</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -356,6 +378,18 @@ de DTR (0=non)</translation>
         <source>9600 baud</source>
         <translation>9600 baud</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 baud</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 baud</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 baud</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -489,6 +523,18 @@ de DTR (0=non)</translation>
         <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>
@@ -747,7 +793,7 @@ de DTR (0=non)</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>La numérotation du numéro a échouée.</translation>
+        <translation type="obsolete">La numérotation du numéro a échouée.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -785,6 +831,14 @@ de DTR (0=non)</translation>
         <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>
@@ -805,19 +859,19 @@ de DTR (0=non)</translation>
     </message>
     <message>
         <source>Font size</source>
-        <translation>Taille de police</translation>
+        <translation type="obsolete">Taille de police</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>petite</translation>
+        <translation type="obsolete">petite</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>moyenne</translation>
+        <translation type="obsolete">moyenne</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>large</translation>
+        <translation type="obsolete">large</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/fr/opie-eye.ts b/i18n/fr/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/fr/opie-eye.ts
+++ b/i18n/fr/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/opie-eye_slave.ts b/i18n/fr/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/fr/opie-eye_slave.ts
+++ b/i18n/fr/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/opie-login.ts b/i18n/fr/opie-login.ts
index 7e67e45..e7708de 100644
--- a/i18n/fr/opie-login.ts
+++ b/i18n/fr/opie-login.ts
@@ -9,7 +9,7 @@ accurately to calibrate your screen.</source>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bienvenue sur Opie</translation>
+        <translation type="obsolete">Bienvenue sur Opie</translation>
     </message>
 </context>
 <context>
@@ -98,7 +98,54 @@ signal non pris en charge
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
-        <translation>&lt;center&gt;Bienvenue sur OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
+        <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 eceb63c..b43fd1b 100644
--- a/i18n/fr/opie-sheet.ts
+++ b/i18n/fr/opie-sheet.ts
@@ -499,143 +499,143 @@
     </message>
     <message>
         <source>&amp;Standard</source>
-        <translation>S&amp;tandard</translation>
+        <translation type="obsolete">S&amp;tandard</translation>
     </message>
     <message>
         <source>Summation</source>
-        <translation>Somme</translation>
+        <translation type="obsolete">Somme</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
-        <translation>&amp;Somme</translation>
+        <translation type="obsolete">&amp;Somme</translation>
     </message>
     <message>
         <source>Absolute Value</source>
-        <translation>Valeur absolue</translation>
+        <translation type="obsolete">Valeur absolue</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
-        <translation>&amp;Absolu</translation>
+        <translation type="obsolete">&amp;Absolu</translation>
     </message>
     <message>
         <source>Sine</source>
-        <translation>Sinus</translation>
+        <translation type="obsolete">Sinus</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
-        <translation>&amp;Sinus</translation>
+        <translation type="obsolete">&amp;Sinus</translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation>Arc sinus</translation>
+        <translation type="obsolete">Arc sinus</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
-        <translation>A&amp;rc sinus</translation>
+        <translation type="obsolete">A&amp;rc sinus</translation>
     </message>
     <message>
         <source>Cosine</source>
-        <translation>Cosinus</translation>
+        <translation type="obsolete">Cosinus</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
-        <translation>&amp;Cosinus</translation>
+        <translation type="obsolete">&amp;Cosinus</translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation>Arc cosinus</translation>
+        <translation type="obsolete">Arc cosinus</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation>Arc c&amp;osinus</translation>
+        <translation type="obsolete">Arc c&amp;osinus</translation>
     </message>
     <message>
         <source>Tangent</source>
-        <translation>Tangeante</translation>
+        <translation type="obsolete">Tangeante</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
-        <translation>&amp;Tangeante</translation>
+        <translation type="obsolete">&amp;Tangeante</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation>Arc Tangeante</translation>
+        <translation type="obsolete">Arc Tangeante</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation>Arc Tan&amp;geante</translation>
+        <translation type="obsolete">Arc Tan&amp;geante</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation>Arc Tangeante des coordonnées</translation>
+        <translation type="obsolete">Arc Tangeante des coordonnées</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation>Arc Tangeante C&amp;oord.</translation>
+        <translation type="obsolete">Arc Tangeante C&amp;oord.</translation>
     </message>
     <message>
         <source>Exponential</source>
-        <translation>Exponentiel</translation>
+        <translation type="obsolete">Exponentiel</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
-        <translation>&amp;Exponentiel</translation>
+        <translation type="obsolete">&amp;Exponentiel</translation>
     </message>
     <message>
         <source>Logarithm</source>
-        <translation>Logarithme</translation>
+        <translation type="obsolete">Logarithme</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
-        <translation>&amp;Logarithme</translation>
+        <translation type="obsolete">&amp;Logarithme</translation>
     </message>
     <message>
         <source>Power</source>
-        <translation>Puissance</translation>
+        <translation type="obsolete">Puissance</translation>
     </message>
     <message>
         <source>&amp;Power</source>
-        <translation>&amp;Puissance</translation>
+        <translation type="obsolete">&amp;Puissance</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
-        <translation>&amp;Mathématiques</translation>
+        <translation type="obsolete">&amp;Mathématiques</translation>
     </message>
     <message>
         <source>Average</source>
-        <translation>Moyenne</translation>
+        <translation type="obsolete">Moyenne</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation>&amp;Moyenne</translation>
+        <translation type="obsolete">&amp;Moyenne</translation>
     </message>
     <message>
         <source>Maximum</source>
-        <translation>Maximum</translation>
+        <translation type="obsolete">Maximum</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
-        <translation>Ma&amp;ximum</translation>
+        <translation type="obsolete">Ma&amp;ximum</translation>
     </message>
     <message>
         <source>Minimum</source>
-        <translation>Minimum</translation>
+        <translation type="obsolete">Minimum</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
-        <translation>Min&amp;imum</translation>
+        <translation type="obsolete">Min&amp;imum</translation>
     </message>
     <message>
         <source>Count</source>
-        <translation>Nombre</translation>
+        <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>&amp;Count</source>
-        <translation>&amp;Nombre</translation>
+        <translation type="obsolete">&amp;Nombre</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
-        <translation>&amp;Statistique</translation>
+        <translation type="obsolete">&amp;Statistique</translation>
     </message>
     <message>
         <source>Functions</source>
@@ -721,6 +721,390 @@ Ce produit est sous license GPL. Il est distribuable gratuitement. Si vous dési
 
 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>
@@ -730,7 +1114,7 @@ http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>Syntax error!</source>
-        <translation>Erreur de syntaxe !</translation>
+        <translation type="obsolete">Erreur de syntaxe !</translation>
     </message>
     <message>
         <source>Search key not found!</source>
diff --git a/i18n/fr/opie-update-symlinks.ts b/i18n/fr/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/opieirc.ts b/i18n/fr/opieirc.ts
index 938c6f2..a5a8ef0 100644
--- a/i18n/fr/opieirc.ts
+++ b/i18n/fr/opieirc.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
@@ -58,6 +58,21 @@
     </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>
@@ -125,7 +140,7 @@
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Surnom d&apos;une personne inconnu changé </translation>
+        <translation type="obsolete">Surnom d&apos;une personne inconnu changé </translation>
     </message>
     <message>
         <source> has quit </source>
@@ -149,7 +164,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>Reçu CTPC VERSION de</translation>
+        <translation type="obsolete">Reçu CTPC VERSION de</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -249,16 +264,113 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>Vous êtes enregistrés en tant que %1</translation>
+        <translation type="obsolete">Vous êtes enregistrés en tant que %1</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 est maintenant %2</translation>
+        <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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -355,7 +467,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>Port nécessaire</translation>
+        <translation type="obsolete">Port nécessaire</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -363,7 +475,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>Nom réel nécessaire</translation>
+        <translation type="obsolete">Nom réel nécessaire</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -417,7 +529,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Connexion à</translation>
+        <translation type="obsolete">Connexion à</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -427,6 +539,25 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
         <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>
@@ -506,6 +637,14 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
         <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>
@@ -553,4 +692,31 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
         <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 2ee9cac..d97aeef 100644
--- a/i18n/fr/opiemail.ts
+++ b/i18n/fr/opiemail.ts
@@ -94,10 +94,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,6 +113,10 @@
         <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>
@@ -445,17 +445,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -838,6 +838,18 @@ Tous les messages seront détruits.</translation>
         <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>
@@ -1069,12 +1081,16 @@ d&apos;un nouveau message</translation>
         <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>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
-        <translation>E-mail par %1</translation>
+        <translation type="obsolete">E-mail par %1</translation>
     </message>
     <message>
         <source>Mail</source>
@@ -1112,6 +1128,10 @@ d&apos;un nouveau message</translation>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/fr/opieplayer2.ts b/i18n/fr/opieplayer2.ts
index 3a51312..4bd1479 100644
--- a/i18n/fr/opieplayer2.ts
+++ b/i18n/fr/opieplayer2.ts
@@ -8,6 +8,13 @@
     </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>
@@ -100,7 +107,7 @@
     </message>
     <message>
         <source>Open File or URL</source>
-        <translation>Ouvrir un fichier ou une URL</translation>
+        <translation type="obsolete">Ouvrir un fichier ou une URL</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
@@ -158,7 +165,7 @@ la liste ?</translation>
     </message>
     <message>
         <source>Open file or URL</source>
-        <translation>Ouvrir un fichier ou une URL</translation>
+        <translation type="obsolete">Ouvrir un fichier ou une URL</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
@@ -166,7 +173,43 @@ la liste ?</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
-        <translation>Enregistrer liste m3u</translation>
+        <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>
@@ -205,6 +248,13 @@ la liste ?</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>
@@ -219,23 +269,52 @@ la liste ?</translation>
     </message>
     <message>
         <source>No input plugin found for this media type</source>
-        <translation>Pas de plugin trouvé pour ce type de média</translation>
+        <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>Pas de plugin &quot;demux&quot; trouvé pour ce type de média</translation>
+        <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>problème de &quot;demuxing&quot; pour ce type de média</translation>
+        <translation type="obsolete">problème de &quot;demuxing&quot; pour ce type de média</translation>
     </message>
     <message>
         <source>Malformed MRL</source>
-        <translation>MRL mal formée</translation>
+        <translation type="obsolete">MRL mal formée</translation>
     </message>
     <message>
         <source>Some other error</source>
-        <translation>D&apos;autres erreurs</translation>
+        <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 871540c..e7666ba 100644
--- a/i18n/fr/opierec.ts
+++ b/i18n/fr/opierec.ts
@@ -114,7 +114,7 @@ votre carte n&apos;est pas reconnue</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>seconds</translation>
+        <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;
@@ -182,15 +182,15 @@ des fichiers sélectionnés ?</translation>
     </message>
     <message>
         <source>Rec</source>
-        <translation>Rec</translation>
+        <translation type="obsolete">Rec</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>Emplacement</translation>
+        <translation type="obsolete">Emplacement</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Date</translation>
+        <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
@@ -206,7 +206,7 @@ des fichiers sélectionnés ?</translation>
     </message>
     <message>
         <source>Stop</source>
-        <translation>Stopper</translation>
+        <translation type="obsolete">Stopper</translation>
     </message>
     <message>
         <source>Auto Mute</source>
@@ -214,7 +214,15 @@ des fichiers sélectionnés ?</translation>
     </message>
     <message>
         <source>Stereo Channels</source>
-        <translation>Canaux stéréo</translation>
+        <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>
 </context>
 </TS>
diff --git a/i18n/fr/opimconverter.ts b/i18n/fr/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/fr/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/osearch.ts b/i18n/fr/osearch.ts
index c9d1748..5e53cea 100644
--- a/i18n/fr/osearch.ts
+++ b/i18n/fr/osearch.ts
@@ -48,7 +48,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Sensible à la casse</translation>
+        <translation type="obsolete">Sensible à la casse</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -66,6 +66,10 @@
         <source></source>
         <translation></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -78,15 +82,15 @@
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
-        <translation>montrer les tâches terminées</translation>
+        <translation type="obsolete">montrer les tâches terminées</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>montrer événements passés</translation>
+        <translation type="obsolete">montrer événements passés</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>rechercher dates</translation>
+        <translation type="obsolete">rechercher dates</translation>
     </message>
     <message>
         <source>show</source>
@@ -122,11 +126,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>rechercher contenu</translation>
+        <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 1181dc8..5b34392 100644
--- a/i18n/fr/oxygen.ts
+++ b/i18n/fr/oxygen.ts
@@ -30,6 +30,10 @@
         <source>Elemental Composition (%):</source>
         <translation>Composition élémentaire (%) : </translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/fr/oyatzee.ts b/i18n/fr/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/fr/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/packagemanager.ts b/i18n/fr/packagemanager.ts
index 6048bf2..c1b4dc6 100644
--- a/i18n/fr/packagemanager.ts
+++ b/i18n/fr/packagemanager.ts
@@ -79,6 +79,46 @@
         <source>Installed on device at:</source>
         <translation>Installé dans : </translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -433,7 +473,7 @@
     </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>
+        <translation type="obsolete">Cliquez ici pour mettre les listes de paquets des serveurs à jour.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -441,7 +481,7 @@
     </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>
+        <translation type="obsolete">Cliquez ici pour mettre à jour tous les paquets installés si une nouvelle version est disponible.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -449,7 +489,7 @@
     </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>
+        <translation type="obsolete">Cliquer ici pour télécharger le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -457,7 +497,7 @@
     </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>
+        <translation type="obsolete">Cliquez ici pour installer, enlever ou mettre à jour le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -469,7 +509,7 @@
     </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>
+        <translation type="obsolete">Cliquez ici pour afficher les paquets non installés disponibles.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -477,7 +517,7 @@
     </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>
+        <translation type="obsolete">Cliquez ici pour afficher les paquets installés sur cet appareil.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -485,7 +525,7 @@
     </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>
+        <translation type="obsolete">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>
@@ -509,7 +549,7 @@
     </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>
+        <translation type="obsolete">Cliquez ici pour rechercher un texte dans les noms de paquets.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -517,7 +557,7 @@
     </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>
+        <translation type="obsolete">Cliquez ici pour trouver le paquets suivant contenant le texte recherché.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -537,7 +577,7 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Cliquez ici pour configurer l&apos;application.</translation>
+        <translation type="obsolete">Cliquez ici pour configurer l&apos;application.</translation>
     </message>
     <message>
         <source>Help</source>
@@ -561,7 +601,7 @@
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Cliquez ici pour fermer la barre de recherche.</translation>
+        <translation type="obsolete">Cliquez ici pour fermer la barre de recherche.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -759,7 +799,7 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation>Ceci est la liste de tous les paquets disponibles sur le serveur sélectionné.
+        <translation type="obsolete">Ceci est 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.
 
@@ -773,7 +813,7 @@ Cochez la case en début de ligne pour sélectionner un paquet.</translation>
     </message>
     <message>
         <source>Click here to apply current filter.</source>
-        <translation>Cliquez ici pour appliquer le filtre courant.</translation>
+        <translation type="obsolete">Cliquez ici pour appliquer le filtre courant.</translation>
     </message>
     <message>
         <source>Filter settings</source>
@@ -781,7 +821,7 @@ Cochez la case en début de ligne pour sélectionner un paquet.</translation>
     </message>
     <message>
         <source>Click here to change the package filter criteria.</source>
-        <translation>Cliquez ici pour modifier les critères de filtrage des fichiers.</translation>
+        <translation type="obsolete">Cliquez ici pour modifier les critères de filtrage des fichiers.</translation>
     </message>
     <message>
         <source>Package Manager</source>
@@ -823,20 +863,106 @@ Cochez la case en début de ligne pour sélectionner un paquet.</translation>
         <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation>La configuration a été mis à jour. Voulez-vous mettre à jour les serveurs et les informations sur les paquets maintenant ?</translation>
     </message>
+    <message>
+        <source>This is a listing of all packages.
+
+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.
+
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to update package lists from servers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to download the currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install local package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install a package file located on device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to configure this application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages available which have not been installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to apply current filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to change the package filter criteria.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to search for text in package names.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
-        <translation>OIpkg</translation>
+        <translation type="obsolete">OIpkg</translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
-        <translation>Erreur lors de l&apos;initialisation de libipkg</translation>
+        <translation type="obsolete">Erreur lors de l&apos;initialisation de libipkg</translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
-        <translation>Erreur lors du détachement de libipkg</translation>
+        <translation type="obsolete">Erreur lors du détachement de libipkg</translation>
+    </message>
+    <message>
+        <source>Linking packages installed in: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Links removed for: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -871,23 +997,23 @@ Cochez la case en début de ligne pour sélectionner un paquet.</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation>Serveur</translation>
+        <translation type="obsolete">Serveur</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom : </translation>
+        <translation type="obsolete">Nom : </translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation>Adresse : </translation>
+        <translation type="obsolete">Adresse : </translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation>Serveur actif</translation>
+        <translation type="obsolete">Serveur actif</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation>Ajouter - Mettre à jour</translation>
+        <translation type="obsolete">Ajouter - Mettre à jour</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -945,6 +1071,148 @@ Cochez la case en début de ligne pour sélectionner un paquet.</translation>
         <source>Troubleshooting output</source>
         <translation>Problème rencontré</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nom : </translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Emplacement : </translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nom : </translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Adresse : </translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -979,6 +1247,18 @@ Cochez la case en début de ligne pour sélectionner un paquet.</translation>
         <source>File list</source>
         <translation>Liste de fichier</translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/fr/powerchord.ts b/i18n/fr/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/fr/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/fr/pyquicklauncher.ts b/i18n/fr/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 2e0a0ad..f687e19 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -393,6 +393,13 @@ Veuillez rechargez la batterie de sauvegarde.</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>
@@ -412,6 +419,13 @@ Veuillez rechargez la batterie de sauvegarde.</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>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index 52d927f..0b161e9 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -76,7 +76,7 @@ Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</transl
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished">&lt;p&gt;Tous les paramètres utilisateurs seront perdus.</translation>
+        <translation type="obsolete">&lt;p&gt;Tous les paramètres utilisateurs seront perdus.</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -84,31 +84,31 @@ Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</transl
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -118,6 +118,26 @@ Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</transl
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -142,23 +162,43 @@ Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <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>
diff --git a/i18n/fr/sfcave-sdl.ts b/i18n/fr/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/sfcave.ts b/i18n/fr/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/fr/sfcave.ts
+++ b/i18n/fr/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/simple-icon.ts b/i18n/fr/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/fr/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/simple-main.ts b/i18n/fr/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/fr/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/simple-pim.ts b/i18n/fr/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/fr/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/simple.ts b/i18n/fr/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/fr/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/stocktickertest.ts b/i18n/fr/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/fr/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/sysinfo.ts b/i18n/fr/sysinfo.ts
index 0009b72..274bf0c 100644
--- a/i18n/fr/sysinfo.ts
+++ b/i18n/fr/sysinfo.ts
@@ -66,10 +66,6 @@
         <source>error</source>
         <translation>Erreur</translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -445,6 +441,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation>Performance</translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -488,5 +488,9 @@ to this process?</source>
         <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/tableviewer.ts b/i18n/fr/tableviewer.ts
index 6e15f80..c6fea9f 100644
--- a/i18n/fr/tableviewer.ts
+++ b/i18n/fr/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Impossible de définir une valeur par défaut pour le type %1. Clé non ajoutée.</translation>
+        <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>DataElem::setField(%1, %2) Pas de type valide trouvé</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) Pas de type valide trouvé</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index cf64cc4..2cd1721 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -205,6 +205,10 @@ Continuer et sauvegarder ?</translation>
 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>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 27030a7..4b83807 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -4,7 +4,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Aujourd&apos;hui</translation>
+        <translation type="unfinished">Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -16,7 +16,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Aucun module trouvé</translation>
+        <translation type="obsolete">Aucun module trouvé</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -26,6 +26,14 @@
         <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>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 0ce2cc7..5103f99 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -10,6 +10,29 @@
         <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>
@@ -43,6 +66,17 @@
     </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>
@@ -54,7 +88,7 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Opie Todolist</translation>
+        <translation type="obsolete">Opie Todolist</translation>
     </message>
     <message>
         <source>silent</source>
@@ -69,39 +103,39 @@
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Nouvelle à partir d&apos;un modèle</translation>
+        <translation type="obsolete">Nouvelle à partir d&apos;un modèle</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nouvelle tâche</translation>
+        <translation type="obsolete">Nouvelle tâche</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Cliquez ici pour créer une nouvelle tâche.</translation>
+        <translation type="obsolete">Cliquez ici pour créer une nouvelle tâche.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Editer la tâche</translation>
+        <translation type="obsolete">Editer la tâche</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Cliquez ici pour modifier la tâche courante.</translation>
+        <translation type="obsolete">Cliquez ici pour modifier la tâche courante.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Voir la tâche</translation>
+        <translation type="obsolete">Voir la tâche</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Supprimer...</translation>
+        <translation type="obsolete">Supprimer...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Cliquez  ici pour effacer la tâche courante.</translation>
+        <translation type="obsolete">Cliquez  ici pour effacer la tâche courante.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Supprimer tout...</translation>
+        <translation type="obsolete">Supprimer tout...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -109,15 +143,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>Transmettre</translation>
+        <translation type="obsolete">Transmettre</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Cliquez ici pour transmettre la tâche courante à un autre dispositif.</translation>
+        <translation type="obsolete">Cliquez ici pour transmettre la tâche courante à un autre dispositif.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Rechercher</translation>
+        <translation type="obsolete">Rechercher</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -137,15 +171,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Tâches</translation>
+        <translation type="obsolete">Tâches</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Catégorie</translation>
+        <translation type="obsolete">Catégorie</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Options</translation>
+        <translation type="obsolete">Options</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -168,7 +202,7 @@ La liste affiche les informations suivantes:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Toutes les catégories</translation>
+        <translation type="obsolete">Toutes les catégories</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -206,7 +240,7 @@ Voulez-vous quitter ?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Non classée</translation>
+        <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>
@@ -218,7 +252,7 @@ Voulez-vous quitter ?</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Dupliquer</translation>
+        <translation type="obsolete">Dupliquer</translation>
     </message>
     <message>
         <source>C.</source>
@@ -238,7 +272,7 @@ Voulez-vous quitter ?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Configurer les modèles</translation>
+        <translation type="obsolete">Configurer les modèles</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/fr/wellenreiter.ts b/i18n/fr/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/fr/wellenreiter.ts
+++ b/i18n/fr/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/fr/zlines.ts b/i18n/fr/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/fr/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/zsafe.ts b/i18n/fr/zsafe.ts
index 3808fcc..45aaee1 100644
--- a/i18n/fr/zsafe.ts
+++ b/i18n/fr/zsafe.ts
@@ -478,7 +478,7 @@ affiche la liste des répertoires et fichiers</translation>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Impossible de créer le répertoire
+        <translation type="obsolete">Impossible de créer le répertoire
 %1
 
 ZSafe va s&apos;arrêter.</translation>
@@ -561,7 +561,7 @@ ZSafe va s&apos;arrêter.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -609,7 +609,7 @@ ZSafe va s&apos;arrêter.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Editer entrée</translation>
+        <translation type="obsolete">Editer entrée</translation>
     </message>
     <message>
         <source>Username</source>
@@ -621,7 +621,7 @@ ZSafe va s&apos;arrêter.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Nouvelle entrée</translation>
+        <translation type="obsolete">Nouvelle entrée</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -750,7 +750,7 @@ nouveau mot de passe</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Gestionnaire mot de passe du Zaurus&lt;br&gt;</translation>
+        <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>
@@ -758,11 +758,11 @@ nouveau mot de passe</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>par Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">par Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Traduit par Amrein-Marie Christophe&lt;br&gt;</translation>
+        <translation type="obsolete">Traduit par Amrein-Marie Christophe&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -778,7 +778,7 @@ nouveau mot de passe</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Créer nouveau document ZSafe</translation>
+        <translation type="obsolete">Créer nouveau document ZSafe</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -786,7 +786,7 @@ nouveau mot de passe</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Enregistrer document ZSafe comme..</translation>
+        <translation type="obsolete">Enregistrer document ZSafe comme..</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.0&lt;br&gt;</source>
@@ -797,7 +797,7 @@ nouveau mot de passe</translation>
 .../Documents/application
 
 ZSafe will now exit.</source>
-        <translation>Impossible de créer le répertoire
+        <translation type="obsolete">Impossible de créer le répertoire
 .../Documents/application
 
 ZSafe va s&apos;arrêter.</translation>
@@ -807,7 +807,7 @@ ZSafe va s&apos;arrêter.</translation>
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
-        <translation>Impossible de créer le répertoire
+        <translation type="obsolete">Impossible de créer le répertoire
 .../Documents/application/zsafe
 
 ZSafe va s&apos;arrêter.</translation>
@@ -878,11 +878,43 @@ pour votre nouveau document.</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation>ZSafe version 2.1.2-jv01b&lt;br&gt;</translation>
+        <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>ZSafe version 2.1.2&lt;br&gt;</translation>
+        <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/fr/zsame.ts b/i18n/fr/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/fr/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index 1cc01fd..04ade79 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Ez a könyvtár nem létezik</translation>
+        <translation type="obsolete">Ez a könyvtár nem létezik</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -140,18 +140,18 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Nem lehetett másolni
+        <translation type="obsolete">Nem lehetett másolni
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>cél</translation>
+        <translation type="obsolete">cél</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Nem lehetett áthelyezni</translation>
+        <translation type="obsolete">Nem lehetett áthelyezni</translation>
     </message>
     <message>
         <source>Add To Documents</source>
@@ -168,7 +168,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Valóban töröl
+        <translation type="obsolete">Valóban töröl
 %1 fájlt?</translation>
     </message>
     <message>
@@ -178,7 +178,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Valóban másol
+        <translation type="obsolete">Valóban másol
 %1 fájlt?</translation>
     </message>
     <message>
@@ -188,28 +188,28 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 létezik. Felülírható?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>már létezik. Valóban törölni akarja?</translation>
+        <translation type="obsolete">már létezik. Valóban törölni akarja?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 létezik. Felülírja?</translation>
+        <translation type="obsolete">%1 létezik. Felülírja?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>%1 nem másolható a %2 helyre</translation>
+        <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>A Fejlett Fájlmenedzser
+        <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
@@ -231,7 +231,7 @@ fordítás: Bácsi László &lt;lackac@math.bme.hu&gt;</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Az aktuális könyvtárt nem lehet törölni
+        <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>
@@ -242,13 +242,13 @@ Nincs ilyen könyvjelző!</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Valóban törli %1-t
+        <translation type="obsolete">Valóban törli %1-t
 minden tartalmával együtt?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Valóban törli
+        <translation type="obsolete">Valóban törli
 %1-t?</translation>
     </message>
     <message>
@@ -284,11 +284,75 @@ minden tartalmával együtt?</translation>
 %1 
 to 
 %2</source>
-        <translation>%1
+        <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>
diff --git a/i18n/hu/backup.ts b/i18n/hu/backup.ts
index 25f4bf6..06c9bc8 100644
--- a/i18n/hu/backup.ts
+++ b/i18n/hu/backup.ts
@@ -2,10 +2,6 @@
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54,6 +50,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -70,10 +74,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,6 +113,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/hu/bartender.ts b/i18n/hu/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/hu/bartender.ts
+++ b/i18n/hu/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/hu/bluetooth-manager.ts b/i18n/hu/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/hu/bluetooth-manager.ts
+++ b/i18n/hu/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/hu/dagger.ts b/i18n/hu/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/hu/dagger.ts
+++ b/i18n/hu/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/hu/launchersettings.ts b/i18n/hu/launchersettings.ts
index b54452f..679868d 100644
--- a/i18n/hu/launchersettings.ts
+++ b/i18n/hu/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/hu/libGPRS.ts b/i18n/hu/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/hu/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libaboutapplet.ts b/i18n/hu/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/hu/libaboutapplet.ts
+++ b/i18n/hu/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/hu/libbatteryapplet.ts b/i18n/hu/libbatteryapplet.ts
index ac40644..05a245c 100644
--- a/i18n/hu/libbatteryapplet.ts
+++ b/i18n/hu/libbatteryapplet.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Elem hátrelévő élettartama</translation>
+        <translation type="obsolete">Elem hátrelévő élettartama</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Elem élettartamából hátra van</translation>
+        <translation type="obsolete">Elem élettartamából hátra van</translation>
     </message>
     <message>
         <source>Battery status</source>
@@ -71,11 +71,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Elem hátrelévő élettartama:</translation>
+        <translation type="obsolete">Elem hátrelévő élettartama:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Elem élettartamából hátra van:</translation>
+        <translation type="obsolete">Elem élettartamából hátra van:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -86,11 +86,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/hu/libbluetooth.ts b/i18n/hu/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/hu/libbluetooth.ts
+++ b/i18n/hu/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libbrightnessapplet.ts b/i18n/hu/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libcable.ts b/i18n/hu/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/hu/libcable.ts
+++ b/i18n/hu/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/libcardmonapplet.ts b/i18n/hu/libcardmonapplet.ts
index 441a701..243d4d2 100644
--- a/i18n/hu/libcardmonapplet.ts
+++ b/i18n/hu/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/libexample_applet.ts b/i18n/hu/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/hu/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libexample_board.ts b/i18n/hu/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/hu/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libexample_vpn.ts b/i18n/hu/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/hu/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libinterfaces.ts b/i18n/hu/libinterfaces.ts
index 8239ed9..080cc89 100644
--- a/i18n/hu/libinterfaces.ts
+++ b/i18n/hu/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/hu/libkppp.ts b/i18n/hu/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/hu/libkppp.ts
+++ b/i18n/hu/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/hu/liblancard.ts b/i18n/hu/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/hu/liblancard.ts
+++ b/i18n/hu/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/liblockapplet.ts b/i18n/hu/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/hu/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libmailwrapper.ts b/i18n/hu/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/hu/libmailwrapper.ts
+++ b/i18n/hu/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/hu/libmemoryapplet.ts b/i18n/hu/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/hu/libmemoryapplet.ts
+++ b/i18n/hu/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/hu/libnetworksettings2.ts b/i18n/hu/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/hu/libnetworksettings2.ts
+++ b/i18n/hu/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/libopiemm2.ts b/i18n/hu/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/hu/libopiemm2.ts
+++ b/i18n/hu/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libopiepim2.ts b/i18n/hu/libopiepim2.ts
index 2aa739c..2fc915b 100644
--- a/i18n/hu/libopiepim2.ts
+++ b/i18n/hu/libopiepim2.ts
@@ -368,6 +368,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
@@ -757,6 +860,34 @@ and </source>
         <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>
diff --git a/i18n/hu/libopiesecurity2.ts b/i18n/hu/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/hu/libopiesecurity2.ts
+++ b/i18n/hu/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/libopietooth2.ts b/i18n/hu/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/hu/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libopietooth2applet.ts b/i18n/hu/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/hu/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libopieui2.ts b/i18n/hu/libopieui2.ts
index 96b23f6..17f7c36 100644
--- a/i18n/hu/libopieui2.ts
+++ b/i18n/hu/libopieui2.ts
@@ -1,39 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>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>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
@@ -210,6 +176,25 @@
     </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>
@@ -217,6 +202,21 @@
     </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>
diff --git a/i18n/hu/libphasestyle.ts b/i18n/hu/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/hu/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libppp.ts b/i18n/hu/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/hu/libppp.ts
+++ b/i18n/hu/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/hu/libprofile.ts b/i18n/hu/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/hu/libprofile.ts
+++ b/i18n/hu/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/hu/libqpickboard.ts b/i18n/hu/libqpickboard.ts
index 488fb8f..694b19e 100644
--- a/i18n/hu/libqpickboard.ts
+++ b/i18n/hu/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libscreenshotapplet.ts b/i18n/hu/libscreenshotapplet.ts
index 15bd7b3..ded2f36 100644
--- a/i18n/hu/libscreenshotapplet.ts
+++ b/i18n/hu/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/libtodayaddressbookplugin.ts b/i18n/hu/libtodayaddressbookplugin.ts
index ea68edf..1d2a0d8 100644
--- a/i18n/hu/libtodayaddressbookplugin.ts
+++ b/i18n/hu/libtodayaddressbookplugin.ts
@@ -10,14 +10,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,10 +51,6 @@ Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/hu/libtodayexampleplugin.ts b/i18n/hu/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/hu/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libtodayweatherplugin.ts b/i18n/hu/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/hu/libtodayweatherplugin.ts
+++ b/i18n/hu/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/libvolumeapplet2.ts b/i18n/hu/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libvpn.ts b/i18n/hu/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/hu/libvpn.ts
+++ b/i18n/hu/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/libwebstyle.ts b/i18n/hu/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/hu/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libwlan.ts b/i18n/hu/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/hu/libwlan.ts
+++ b/i18n/hu/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/hu/main-tab.ts b/i18n/hu/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/hu/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/multiauth.ts b/i18n/hu/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/networksettings2.ts b/i18n/hu/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/hu/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/opie-console.ts b/i18n/hu/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/hu/opie-console.ts
+++ b/i18n/hu/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/hu/opie-eye.ts b/i18n/hu/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/hu/opie-eye.ts
+++ b/i18n/hu/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/opie-eye_slave.ts b/i18n/hu/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/hu/opie-eye_slave.ts
+++ b/i18n/hu/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/opie-login.ts b/i18n/hu/opie-login.ts
index 86c7f6b..b35432a 100644
--- a/i18n/hu/opie-login.ts
+++ b/i18n/hu/opie-login.ts
@@ -10,7 +10,7 @@ kereszteket a képernyőn.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Üdvözli Önt az Opie</translation>
+        <translation type="obsolete">Üdvözli Önt az Opie</translation>
     </message>
 </context>
 <context>
@@ -94,8 +94,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/hu/opie-sheet.ts b/i18n/hu/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/hu/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/opie-update-symlinks.ts b/i18n/hu/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/opieirc.ts b/i18n/hu/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/hu/opieirc.ts
+++ b/i18n/hu/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/hu/opiemail.ts b/i18n/hu/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/hu/opiemail.ts
+++ b/i18n/hu/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/hu/opieplayer2.ts b/i18n/hu/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/hu/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/hu/opierec.ts b/i18n/hu/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/hu/opierec.ts
+++ b/i18n/hu/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/opimconverter.ts b/i18n/hu/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/hu/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/osearch.ts b/i18n/hu/osearch.ts
index e20a0f4..97ed663 100644
--- a/i18n/hu/osearch.ts
+++ b/i18n/hu/osearch.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -96,35 +96,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show completed tasks</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/oxygen.ts b/i18n/hu/oxygen.ts
index 95ea62e..8a90e8e 100644
--- a/i18n/hu/oxygen.ts
+++ b/i18n/hu/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/hu/oyatzee.ts b/i18n/hu/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/hu/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/packagemanager.ts b/i18n/hu/packagemanager.ts
index f6ddc91..d86ecec 100644
--- a/i18n/hu/packagemanager.ts
+++ b/i18n/hu/packagemanager.ts
@@ -1,11 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
-    <name>DataManager</name>
-</context>
-<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
@@ -47,9 +41,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InputDialog</name>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallDlg</name>
@@ -128,15 +159,6 @@
     </message>
 </context>
 <context>
-    <name>InstallDlgImpl</name>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-</context>
-<context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
@@ -147,119 +169,123 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
+        <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade</source>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
+        <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply changes</source>
+        <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show packages not installed</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show installed packages</source>
+        <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show updated packages</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Packages</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -269,78 +295,86 @@ A blue dot next to the package name indicates that the package is currently inst
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -375,79 +409,201 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Depends</source>
+        <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Reinstall</source>
+        <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Remove</source>
+        <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Overwrite</source>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Errors only</source>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal messages</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Informative messages</source>
+        <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Troubleshooting output</source>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -482,17 +638,17 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-</context>
-<context>
-    <name>QObject</name>
-</context>
-<context>
-    <name>QuestionDlg</name>
-</context>
-<context>
-    <name>SettingsImpl</name>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/powerchord.ts b/i18n/hu/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/hu/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/hu/pyquicklauncher.ts b/i18n/hu/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index ace565b..309874d 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -380,6 +380,13 @@ Kérem töltse fel a biztonsági-elemt.</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>
@@ -399,6 +406,13 @@ Kérem töltse fel a biztonsági-elemt.</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>
diff --git a/i18n/hu/security.ts b/i18n/hu/security.ts
index 584fa09..ca86afe 100644
--- a/i18n/hu/security.ts
+++ b/i18n/hu/security.ts
@@ -70,47 +70,35 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -137,23 +125,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/sfcave-sdl.ts b/i18n/hu/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/sfcave.ts b/i18n/hu/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/hu/sfcave.ts
+++ b/i18n/hu/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/simple-icon.ts b/i18n/hu/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/hu/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/simple-main.ts b/i18n/hu/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/hu/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/simple-pim.ts b/i18n/hu/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/hu/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/simple.ts b/i18n/hu/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/hu/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/stocktickertest.ts b/i18n/hu/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/hu/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/sysinfo.ts b/i18n/hu/sysinfo.ts
index 10b1b3e..9ff6285 100644
--- a/i18n/hu/sysinfo.ts
+++ b/i18n/hu/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -346,6 +342,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -390,5 +390,9 @@ to this process?</source>
         <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/tableviewer.ts b/i18n/hu/tableviewer.ts
index 7d41b6f..4570c99 100644
--- a/i18n/hu/tableviewer.ts
+++ b/i18n/hu/tableviewer.ts
@@ -1,16 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
diff --git a/i18n/hu/textedit.ts b/i18n/hu/textedit.ts
index f6a71b7..ef72df2 100644
--- a/i18n/hu/textedit.ts
+++ b/i18n/hu/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
 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>
diff --git a/i18n/hu/today.ts b/i18n/hu/today.ts
index cbaf94b..0430c71 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Ma</translation>
+        <translation type="unfinished">Ma</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Nem találtam kiegészítőt</translation>
+        <translation type="obsolete">Nem találtam kiegészítőt</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -25,6 +25,14 @@
         <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>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index 8eb0808..c934f83 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -9,6 +9,29 @@
         <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>
@@ -34,6 +57,17 @@
     </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>
@@ -51,48 +85,44 @@
         <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation type="unfinished">Új sablonból</translation>
+        <translation type="obsolete">Új sablonból</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation type="unfinished">Új feladat</translation>
+        <translation type="obsolete">Új feladat</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation type="unfinished">Bökjön ide új feladat létrehozásához.</translation>
+        <translation type="obsolete">Bökjön ide új feladat létrehozásához.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">Feladat szerkesztése</translation>
+        <translation type="obsolete">Feladat szerkesztése</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation type="unfinished">Bökjön ide az aktuális feladat módosításához.</translation>
+        <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="unfinished">Feladat megnézése</translation>
+        <translation type="obsolete">Feladat megnézése</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation type="unfinished">Töröl...</translation>
+        <translation type="obsolete">Töröl...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation type="unfinished">Bökjön ide az aktuális feladat eltávolításához.</translation>
+        <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="unfinished">Mindent töröl...</translation>
+        <translation type="obsolete">Mindent töröl...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,15 +130,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation type="unfinished">Átsugárzás</translation>
+        <translation type="obsolete">Átsugárzás</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished">Bökjön ide az aktuális felada másik eszköznek küldéséhez.</translation>
+        <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="unfinished">Keresés</translation>
+        <translation type="obsolete">Keresés</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -128,15 +158,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation type="unfinished">Adat</translation>
+        <translation type="obsolete">Adat</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategória</translation>
+        <translation type="obsolete">Kategória</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished">Beállítások</translation>
+        <translation type="obsolete">Beállítások</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -160,7 +190,7 @@ A lista az alábbi információkat tartalmazza:
     </message>
     <message>
         <source>All Categories</source>
-        <translation type="unfinished">Minden kategória</translation>
+        <translation type="obsolete">Minden kategória</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -198,7 +228,7 @@ Mégis kilép?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished">Iktatatlan</translation>
+        <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>
@@ -210,7 +240,7 @@ Mégis kilép?</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation type="unfinished">Dupláz</translation>
+        <translation type="obsolete">Dupláz</translation>
     </message>
     <message>
         <source>C.</source>
@@ -230,7 +260,7 @@ Mégis kilép?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation type="unfinished">Sablonok beállítása</translation>
+        <translation type="obsolete">Sablonok beállítása</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/hu/wellenreiter.ts b/i18n/hu/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/hu/wellenreiter.ts
+++ b/i18n/hu/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/hu/zlines.ts b/i18n/hu/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/hu/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/zsafe.ts b/i18n/hu/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/hu/zsafe.ts
+++ b/i18n/hu/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/zsame.ts b/i18n/hu/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/hu/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/advancedfm.ts b/i18n/it/advancedfm.ts
index d5fc160..c01054e 100644
--- a/i18n/it/advancedfm.ts
+++ b/i18n/it/advancedfm.ts
@@ -8,7 +8,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>La directory non esiste</translation>
+        <translation type="obsolete">La directory non esiste</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
@@ -137,13 +137,13 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Impossibile copiare
+        <translation type="obsolete">Impossibile copiare
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>to
+        <translation type="obsolete">to
 </translation>
     </message>
     <message>
@@ -157,7 +157,7 @@
     <message>
         <source>Could not move
 </source>
-        <translation>Impossibile spostare
+        <translation type="obsolete">Impossibile spostare
 </translation>
     </message>
     <message>
@@ -181,7 +181,7 @@
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 copyright 2002-2003 di
 L.J.Potter &lt;llornkcor@handhelds.org&gt;
 sotto licenza GPL</translation>
@@ -205,7 +205,7 @@ sotto licenza GPL</translation>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Vuoi realmente cancellare
+        <translation type="obsolete">Vuoi realmente cancellare
 %1 file?</translation>
     </message>
     <message>
@@ -215,7 +215,7 @@ sotto licenza GPL</translation>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Copiare realmente
+        <translation type="obsolete">Copiare realmente
 %1 file?</translation>
     </message>
     <message>
@@ -224,22 +224,22 @@ sotto licenza GPL</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 esiste. Ok per sovrascrivere?</translation>
+        <translation type="obsolete">%1 esiste. Ok per sovrascrivere?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Impossibile copiare %1 su %2</translation>
+        <translation type="obsolete">Impossibile copiare %1 su %2</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 esiste. Ok per sovrascrivere?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation> già esiste.
+        <translation type="obsolete"> già esiste.
 Vuoi veramente eliminarlo?</translation>
     </message>
     <message>
@@ -250,7 +250,7 @@ Vuoi veramente eliminarlo?</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Impossibile rimuovere la directory corrente
+        <translation type="obsolete">Impossibile rimuovere la directory corrente
 dai bookmark.
 Non è inserita nei bookmark!</translation>
     </message>
@@ -261,13 +261,13 @@ Non è inserita nei bookmark!</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Vuoi veramente eliminare %1
+        <translation type="obsolete">Vuoi veramente eliminare %1
 e tutto il suo contenuto ?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Vuoi veramente eliminare
+        <translation type="obsolete">Vuoi veramente eliminare
 %1?</translation>
     </message>
     <message>
@@ -291,10 +291,67 @@ e tutto il suo contenuto ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
+        <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>
diff --git a/i18n/it/backup.ts b/i18n/it/backup.ts
index c71740f..f29affd 100644
--- a/i18n/it/backup.ts
+++ b/i18n/it/backup.ts
@@ -4,7 +4,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Backup e Restore... in corso...</translation>
+        <translation type="obsolete">Backup e Restore... in corso...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -64,6 +64,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -81,7 +89,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Salva Su</translation>
+        <translation type="obsolete">Salva Su</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -127,6 +135,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/it/bartender.ts b/i18n/it/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/it/bartender.ts
+++ b/i18n/it/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/it/bluetooth-manager.ts b/i18n/it/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/it/bluetooth-manager.ts
+++ b/i18n/it/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/it/dagger.ts b/i18n/it/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/it/dagger.ts
+++ b/i18n/it/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/it/launchersettings.ts b/i18n/it/launchersettings.ts
index 74ff601..17ab54a 100644
--- a/i18n/it/launchersettings.ts
+++ b/i18n/it/launchersettings.ts
@@ -177,6 +177,14 @@
         <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>
diff --git a/i18n/it/libGPRS.ts b/i18n/it/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/it/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libaboutapplet.ts b/i18n/it/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/it/libaboutapplet.ts
+++ b/i18n/it/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/it/libbatteryapplet.ts b/i18n/it/libbatteryapplet.ts
index 6ce51d0..11c21a9 100644
--- a/i18n/it/libbatteryapplet.ts
+++ b/i18n/it/libbatteryapplet.ts
@@ -12,7 +12,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Percentuale batteria rimasta</translation>
+        <translation type="obsolete">Percentuale batteria rimasta</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -52,7 +52,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Tempo batteria rimasto</translation>
+        <translation type="obsolete">Tempo batteria rimasto</translation>
     </message>
     <message>
         <source>Battery status</source>
@@ -72,11 +72,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Percentuale batteria rimasta:</translation>
+        <translation type="obsolete">Percentuale batteria rimasta:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Tempo batteria rimasto:</translation>
+        <translation type="obsolete">Tempo batteria rimasto:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -87,11 +87,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/it/libbluetooth.ts b/i18n/it/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/it/libbluetooth.ts
+++ b/i18n/it/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libbrightnessapplet.ts b/i18n/it/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libcable.ts b/i18n/it/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/it/libcable.ts
+++ b/i18n/it/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/libcardmonapplet.ts b/i18n/it/libcardmonapplet.ts
index 15bde80..5acf20b 100644
--- a/i18n/it/libcardmonapplet.ts
+++ b/i18n/it/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation>Eject:</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/libexample_applet.ts b/i18n/it/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/it/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libexample_board.ts b/i18n/it/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/it/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libexample_vpn.ts b/i18n/it/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/it/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libinterfaces.ts b/i18n/it/libinterfaces.ts
index 892925a..c0cdc61 100644
--- a/i18n/it/libinterfaces.ts
+++ b/i18n/it/libinterfaces.ts
@@ -1,6 +1,13 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Riavvia interfaccia</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/it/libkppp.ts b/i18n/it/libkppp.ts
index 94e02f0..c74f27d 100644
--- a/i18n/it/libkppp.ts
+++ b/i18n/it/libkppp.ts
@@ -452,6 +452,10 @@ potrai modificare a piacimento</translation>
         <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>
diff --git a/i18n/it/liblancard.ts b/i18n/it/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/it/liblancard.ts
+++ b/i18n/it/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/liblockapplet.ts b/i18n/it/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/it/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libmailwrapper.ts b/i18n/it/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/it/libmailwrapper.ts
+++ b/i18n/it/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/it/libmemoryapplet.ts b/i18n/it/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/it/libmemoryapplet.ts
+++ b/i18n/it/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/it/libnetworksettings2.ts b/i18n/it/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/it/libnetworksettings2.ts
+++ b/i18n/it/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/libopiemm2.ts b/i18n/it/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/it/libopiemm2.ts
+++ b/i18n/it/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libopiepim2.ts b/i18n/it/libopiepim2.ts
index 35195eb..f2fc63e 100644
--- a/i18n/it/libopiepim2.ts
+++ b/i18n/it/libopiepim2.ts
@@ -598,6 +598,109 @@ e </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1049,6 +1152,34 @@ e </translation>
         <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>
diff --git a/i18n/it/libopiesecurity2.ts b/i18n/it/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/it/libopiesecurity2.ts
+++ b/i18n/it/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/libopietooth2.ts b/i18n/it/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/it/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libopietooth2applet.ts b/i18n/it/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/it/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libopieui2.ts b/i18n/it/libopieui2.ts
index d83df65..df08e5c 100644
--- a/i18n/it/libopieui2.ts
+++ b/i18n/it/libopieui2.ts
@@ -113,19 +113,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">FileDialog</translation>
+        <translation type="obsolete">FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Apri</translation>
+        <translation type="obsolete">Apri</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Salva</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Salva</translation>
     </message>
 </context>
 <context>
@@ -173,15 +169,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Stile</translation>
+        <translation type="obsolete">Stile</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Dimensione</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
     </message>
 </context>
 <context>
@@ -450,15 +446,19 @@ e </translation>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">FileDialog</translation>
+        <translation type="unfinished">FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Apri</translation>
+        <translation type="unfinished">Apri</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Salva</translation>
+        <translation type="unfinished">Salva</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -472,15 +472,15 @@ e </translation>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Stile</translation>
+        <translation type="unfinished">Stile</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/it/libphasestyle.ts b/i18n/it/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/it/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libppp.ts b/i18n/it/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/it/libppp.ts
+++ b/i18n/it/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/it/libprofile.ts b/i18n/it/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/it/libprofile.ts
+++ b/i18n/it/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/it/libqpickboard.ts b/i18n/it/libqpickboard.ts
index 094c0de..aa37a13 100644
--- a/i18n/it/libqpickboard.ts
+++ b/i18n/it/libqpickboard.ts
@@ -1,10 +1,90 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libscreenshotapplet.ts b/i18n/it/libscreenshotapplet.ts
index 929e078..56fef4c 100644
--- a/i18n/it/libscreenshotapplet.ts
+++ b/i18n/it/libscreenshotapplet.ts
@@ -46,5 +46,13 @@
         <source>Connection to %1 failed.</source>
         <translation>Connessione su %1 fallita.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/libtodayaddressbookplugin.ts b/i18n/it/libtodayaddressbookplugin.ts
index a79a5de..76d5e14 100644
--- a/i18n/it/libtodayaddressbookplugin.ts
+++ b/i18n/it/libtodayaddressbookplugin.ts
@@ -12,11 +12,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Unisci riga dopo X caratteri: </translation>
+        <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>Dopo quanti caratteri le informazioni sull&apos;impegno non devono essere visualizzate</translation>
+        <translation type="obsolete">Dopo quanti caratteri le informazioni sull&apos;impegno non devono essere visualizzate</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
@@ -28,7 +28,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="unfinished">Per attivare le impostazioni: Riavvia l&apos;applicazione !</translation>
+        <translation type="obsolete">Per attivare le impostazioni: Riavvia l&apos;applicazione !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
diff --git a/i18n/it/libtodayexampleplugin.ts b/i18n/it/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/it/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libtodayweatherplugin.ts b/i18n/it/libtodayweatherplugin.ts
index 98bda7d..76e1e73 100644
--- a/i18n/it/libtodayweatherplugin.ts
+++ b/i18n/it/libtodayweatherplugin.ts
@@ -108,11 +108,15 @@ Pres: </translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation> hPa</translation>
+        <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/libvolumeapplet2.ts b/i18n/it/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libvpn.ts b/i18n/it/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/it/libvpn.ts
+++ b/i18n/it/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/libwebstyle.ts b/i18n/it/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/it/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libwlan.ts b/i18n/it/libwlan.ts
index 0e3ae7b..db0bfd9 100644
--- a/i18n/it/libwlan.ts
+++ b/i18n/it/libwlan.ts
@@ -1,9 +1,6 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -198,9 +195,6 @@
     </message>
 </context>
 <context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/it/main-tab.ts b/i18n/it/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/it/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/multiauth.ts b/i18n/it/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/networksettings2.ts b/i18n/it/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/it/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/opie-console.ts b/i18n/it/opie-console.ts
index 43e2c3a..cbed62b 100644
--- a/i18n/it/opie-console.ts
+++ b/i18n/it/opie-console.ts
@@ -265,6 +265,28 @@
         <source>Edit Key</source>
         <translation>Modifica Tasto</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -356,6 +378,18 @@
         <source>9600 baud</source>
         <translation>9600 baud</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 baud</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 baud</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 baud</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -489,6 +523,18 @@
         <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>
@@ -747,7 +793,7 @@
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Composizione del numero fallita.</translation>
+        <translation type="obsolete">Composizione del numero fallita.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -785,6 +831,14 @@
         <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>
@@ -805,19 +859,19 @@
     </message>
     <message>
         <source>Font size</source>
-        <translation>Dimensione Font</translation>
+        <translation type="obsolete">Dimensione Font</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>piccolo</translation>
+        <translation type="obsolete">piccolo</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>medio</translation>
+        <translation type="obsolete">medio</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>grande</translation>
+        <translation type="obsolete">grande</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/it/opie-eye.ts b/i18n/it/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/it/opie-eye.ts
+++ b/i18n/it/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/opie-eye_slave.ts b/i18n/it/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/it/opie-eye_slave.ts
+++ b/i18n/it/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/opie-login.ts b/i18n/it/opie-login.ts
index a64cc19..adaad12 100644
--- a/i18n/it/opie-login.ts
+++ b/i18n/it/opie-login.ts
@@ -10,7 +10,7 @@ con fermezza per tarare lo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Benvenuto in Opie</translation>
+        <translation type="obsolete">Benvenuto in Opie</translation>
     </message>
 </context>
 <context>
@@ -97,8 +97,51 @@ da un segnale
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/it/opie-sheet.ts b/i18n/it/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/it/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/opie-update-symlinks.ts b/i18n/it/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/opieirc.ts b/i18n/it/opieirc.ts
index 96b3491..1a51960 100644
--- a/i18n/it/opieirc.ts
+++ b/i18n/it/opieirc.ts
@@ -16,7 +16,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
@@ -59,6 +59,21 @@
     </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>
@@ -90,7 +105,7 @@
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Nickname di un utente sconosciuto modificato</translation>
+        <translation type="obsolete">Nickname di un utente sconosciuto modificato</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
@@ -110,7 +125,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>Ricevuto un CTCP VERSION da </translation>
+        <translation type="obsolete">Ricevuto un CTCP VERSION da </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -210,16 +225,113 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>Sei conosciuto ora come %1</translation>
+        <translation type="obsolete">Sei conosciuto ora come %1</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 è ora conosciuto come %2</translation>
+        <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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -316,7 +428,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>E&apos; richiesta una porta</translation>
+        <translation type="obsolete">E&apos; richiesta una porta</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -324,7 +436,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>E&apos; richiesto un nome reale</translation>
+        <translation type="obsolete">E&apos; richiesto un nome reale</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -378,7 +490,7 @@ o &apos;+&apos;</translation>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Connessione a</translation>
+        <translation type="obsolete">Connessione a</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -388,6 +500,25 @@ o &apos;+&apos;</translation>
         <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>
@@ -467,6 +598,14 @@ o &apos;+&apos;</translation>
         <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>
@@ -514,4 +653,31 @@ o &apos;+&apos;</translation>
         <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 242ccfc..99637a7 100644
--- a/i18n/it/opiemail.ts
+++ b/i18n/it/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/it/opieplayer2.ts b/i18n/it/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/it/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/it/opierec.ts b/i18n/it/opierec.ts
index bfa3d69..53185a0 100644
--- a/i18n/it/opierec.ts
+++ b/i18n/it/opierec.ts
@@ -115,7 +115,7 @@ scheda non è stata riconosciuta</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation> secondi</translation>
+        <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;
@@ -183,15 +183,15 @@ il file selezionato?</translation>
     </message>
     <message>
         <source>Rec</source>
-        <translation>Registra</translation>
+        <translation type="obsolete">Registra</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>Ubicazione</translation>
+        <translation type="obsolete">Ubicazione</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
@@ -207,14 +207,18 @@ il file selezionato?</translation>
     </message>
     <message>
         <source>Stop</source>
-        <translation>Stop</translation>
+        <translation type="obsolete">Stop</translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/opimconverter.ts b/i18n/it/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/it/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/osearch.ts b/i18n/it/osearch.ts
index 2bc6950..5c76cbc 100644
--- a/i18n/it/osearch.ts
+++ b/i18n/it/osearch.ts
@@ -48,7 +48,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Cse sensitive</translation>
+        <translation type="obsolete">Cse sensitive</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -66,6 +66,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -78,15 +82,15 @@
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
-        <translation>mostra attività terminate</translation>
+        <translation type="obsolete">mostra attività terminate</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>mostra eventi passati</translation>
+        <translation type="obsolete">mostra eventi passati</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>cerca nei giorni</translation>
+        <translation type="obsolete">cerca nei giorni</translation>
     </message>
     <message>
         <source>show</source>
@@ -122,11 +126,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>cerca contenuto</translation>
+        <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 7421f8d..0f09500 100644
--- a/i18n/it/oxygen.ts
+++ b/i18n/it/oxygen.ts
@@ -26,6 +26,10 @@
         <source>Chemical Formula</source>
         <translation>Formula Chimica</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/it/oyatzee.ts b/i18n/it/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/it/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/packagemanager.ts b/i18n/it/packagemanager.ts
index fb3a01f..344ecd6 100644
--- a/i18n/it/packagemanager.ts
+++ b/i18n/it/packagemanager.ts
@@ -60,6 +60,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -379,7 +419,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Premi qui per aggiornare le liste dei pacchetti dai server.</translation>
+        <translation type="obsolete">Premi qui per aggiornare le liste dei pacchetti dai server.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -387,7 +427,7 @@
     </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>
+        <translation type="obsolete">Premi qui per fare l&apos;upgrade di tutti i pacchetti installati se è disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -395,7 +435,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Premi qui per fare il download dei pacchetti selezionati.</translation>
+        <translation type="obsolete">Premi qui per fare il download dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -403,7 +443,7 @@
     </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>
+        <translation type="obsolete">Premi qui per installare, eliminare o fare l&apos;upgrade dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -415,7 +455,7 @@
     </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>
+        <translation type="obsolete">Premi qui per visualizzare i pacchetti disponibili non ancora installati.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -423,7 +463,7 @@
     </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>
+        <translation type="obsolete">Premi qui per visualizzare i pacchetti installati su questo dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -431,7 +471,7 @@
     </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>
+        <translation type="obsolete">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>
@@ -455,7 +495,7 @@
     </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>
+        <translation type="obsolete">Premi qui per cercare del testo nei nomi dei pacchetti.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -463,7 +503,7 @@
     </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>
+        <translation type="obsolete">Premi qui per trovare il successivo nome del pacchetto che contiene il testo che stai cercando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -483,11 +523,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Premi qui per configurare questa applicazione.</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Premi qui per nascondere la toolbar di ricerca.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -646,84 +686,140 @@ Sei sicuro?
         <translation type="obsolete">Aggiornamento...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -759,23 +855,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Server</translation>
+        <translation type="obsolete">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
+        <translation type="obsolete">Nome:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Indirizzo:</translation>
+        <translation type="obsolete">Indirizzo:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Server Attivo</translation>
+        <translation type="obsolete">Server Attivo</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Aggiorna</translation>
+        <translation type="obsolete">Aggiorna</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -833,6 +929,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Output troubleshooting</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nome:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Ubicazione:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nome:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Indirizzo:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -865,6 +1103,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/it/powerchord.ts b/i18n/it/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/it/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/it/pyquicklauncher.ts b/i18n/it/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index 6a6b350..4a55bc9 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -389,6 +389,13 @@ Cambiarla subito.</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>
@@ -408,6 +415,13 @@ Cambiarla subito.</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>
diff --git a/i18n/it/security.ts b/i18n/it/security.ts
index 15bf662..5bfe571 100644
--- a/i18n/it/security.ts
+++ b/i18n/it/security.ts
@@ -71,40 +71,32 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -114,6 +106,26 @@ You can only select an actually configured user.</source>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -138,23 +150,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/sfcave-sdl.ts b/i18n/it/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/sfcave.ts b/i18n/it/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/it/sfcave.ts
+++ b/i18n/it/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/simple-icon.ts b/i18n/it/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/it/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/simple-main.ts b/i18n/it/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/it/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/simple-pim.ts b/i18n/it/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/it/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/simple.ts b/i18n/it/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/it/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/stocktickertest.ts b/i18n/it/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/it/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/sysinfo.ts b/i18n/it/sysinfo.ts
index 18383fc..85bc628 100644
--- a/i18n/it/sysinfo.ts
+++ b/i18n/it/sysinfo.ts
@@ -62,10 +62,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -355,6 +351,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -398,5 +398,9 @@ to this process?</source>
         <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 2478656..b0614ba 100644
--- a/i18n/it/tableviewer.ts
+++ b/i18n/it/tableviewer.ts
@@ -4,11 +4,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Impossibile creare valore predefinito per il tipo %1, Chiave non aggiunta.</translation>
+        <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>DataElem::setField(%1, %2) Tipo valido non trovato</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) Tipo valido non trovato</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/it/textedit.ts b/i18n/it/textedit.ts
index cf79811..a95a1f5 100644
--- a/i18n/it/textedit.ts
+++ b/i18n/it/textedit.ts
@@ -207,6 +207,10 @@ 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>
diff --git a/i18n/it/today.ts b/i18n/it/today.ts
index 16d8fc4..caec888 100644
--- a/i18n/it/today.ts
+++ b/i18n/it/today.ts
@@ -4,7 +4,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Oggi</translation>
+        <translation type="unfinished">Oggi</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -16,7 +16,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Nessun plugin trovato</translation>
+        <translation type="obsolete">Nessun plugin trovato</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -26,6 +26,14 @@
         <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>
diff --git a/i18n/it/todolist.ts b/i18n/it/todolist.ts
index d9c6d6a..07f9d3e 100644
--- a/i18n/it/todolist.ts
+++ b/i18n/it/todolist.ts
@@ -10,6 +10,29 @@
         <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>
@@ -35,10 +58,21 @@
     </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>Attività Opie</translation>
+        <translation type="obsolete">Attività Opie</translation>
     </message>
     <message>
         <source>Enter Task</source>
@@ -61,39 +95,39 @@
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Nuova da modello</translation>
+        <translation type="obsolete">Nuova da modello</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nuova Attività</translation>
+        <translation type="obsolete">Nuova Attività</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Premi qui per creare una nuova attività.</translation>
+        <translation type="obsolete">Premi qui per creare una nuova attività.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Modifica Attività</translation>
+        <translation type="obsolete">Modifica Attività</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Premi qui per modificare l&apos;attività corrente.</translation>
+        <translation type="obsolete">Premi qui per modificare l&apos;attività corrente.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Visualizza Attività</translation>
+        <translation type="obsolete">Visualizza Attività</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Elimina...</translation>
+        <translation type="obsolete">Elimina...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Premi qui per eliminare l&apos;attività corrente.</translation>
+        <translation type="obsolete">Premi qui per eliminare l&apos;attività corrente.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Elimina tutti...</translation>
+        <translation type="obsolete">Elimina tutti...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -101,19 +135,19 @@
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Copia</translation>
+        <translation type="obsolete">Copia</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Trasmetti</translation>
+        <translation type="obsolete">Trasmetti</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Premi qui per inviare l&apos;attività in corso ad un altro dispositivo.</translation>
+        <translation type="obsolete">Premi qui per inviare l&apos;attività in corso ad un altro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Trova</translation>
+        <translation type="obsolete">Trova</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -133,15 +167,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Dati</translation>
+        <translation type="obsolete">Dati</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Categoria</translation>
+        <translation type="obsolete">Categoria</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opzioni</translation>
+        <translation type="obsolete">Opzioni</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -165,11 +199,11 @@ Vengono elencate le seguenti informazioni:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Tutte le Categorie</translation>
+        <translation type="obsolete">Tutte le Categorie</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Vuota</translation>
+        <translation type="obsolete">Vuota</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -225,7 +259,7 @@ Uscire comunque?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Modifica Modelli</translation>
+        <translation type="obsolete">Modifica Modelli</translation>
     </message>
     <message>
         <source>Template Editor</source>
diff --git a/i18n/it/wellenreiter.ts b/i18n/it/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/it/wellenreiter.ts
+++ b/i18n/it/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/it/zlines.ts b/i18n/it/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/it/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/zsafe.ts b/i18n/it/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/it/zsafe.ts
+++ b/i18n/it/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/zsame.ts b/i18n/it/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/it/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/advancedfm.ts b/i18n/ja/advancedfm.ts
index e7e44d6..70a4f46 100644
--- a/i18n/ja/advancedfm.ts
+++ b/i18n/ja/advancedfm.ts
@@ -14,17 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></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="unfinished"></translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -105,12 +94,6 @@ and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -163,11 +146,6 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -180,98 +158,107 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
+        <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1?</source>
+        <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File Exists!</source>
+        <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
+        <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy %1 to %2</source>
+        <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>to
-</source>
+        <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
+        <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> As</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
+        <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>Could not move
-</source>
+        <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>Could not copy 
-%1 
-to 
-%2</source>
+        <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AdvancedFm Output</source>
+        <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advancedfm Beam out</source>
+        <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ir sent.</source>
+        <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
+        <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not rename</source>
+        <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Yet Implemented</source>
+        <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>
diff --git a/i18n/ja/backup.ts b/i18n/ja/backup.ts
index 75e23eb..c6f598c 100644
--- a/i18n/ja/backup.ts
+++ b/i18n/ja/backup.ts
@@ -2,10 +2,6 @@
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
@@ -54,6 +50,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -66,10 +70,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,6 +113,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/ja/bartender.ts b/i18n/ja/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/ja/bartender.ts
+++ b/i18n/ja/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/ja/bluetooth-manager.ts b/i18n/ja/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/ja/bluetooth-manager.ts
+++ b/i18n/ja/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/ja/dagger.ts b/i18n/ja/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/ja/dagger.ts
+++ b/i18n/ja/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/ja/launchersettings.ts b/i18n/ja/launchersettings.ts
index 2ef3cd4..7c7d23c 100644
--- a/i18n/ja/launchersettings.ts
+++ b/i18n/ja/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/ja/libGPRS.ts b/i18n/ja/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/ja/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libaboutapplet.ts b/i18n/ja/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/ja/libaboutapplet.ts
+++ b/i18n/ja/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/ja/libbatteryapplet.ts b/i18n/ja/libbatteryapplet.ts
index 63d7afc..aeb2c4a 100644
--- a/i18n/ja/libbatteryapplet.ts
+++ b/i18n/ja/libbatteryapplet.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -62,27 +58,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
+        <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining: </source>
+        <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <source>Remaing Power: %1 %2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No jacket with battery inserted</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/libbluetooth.ts b/i18n/ja/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/ja/libbluetooth.ts
+++ b/i18n/ja/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libbrightnessapplet.ts b/i18n/ja/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ja/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ja/libcable.ts b/i18n/ja/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/ja/libcable.ts
+++ b/i18n/ja/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/libcardmonapplet.ts b/i18n/ja/libcardmonapplet.ts
index 3637f01..37329c3 100644
--- a/i18n/ja/libcardmonapplet.ts
+++ b/i18n/ja/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/libexample_applet.ts b/i18n/ja/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/ja/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libexample_board.ts b/i18n/ja/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/ja/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libexample_vpn.ts b/i18n/ja/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/ja/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libinterfaces.ts b/i18n/ja/libinterfaces.ts
index e871479..1a11276 100644
--- a/i18n/ja/libinterfaces.ts
+++ b/i18n/ja/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/ja/libkppp.ts b/i18n/ja/libkppp.ts
index bc82034..0982bb0 100644
--- a/i18n/ja/libkppp.ts
+++ b/i18n/ja/libkppp.ts
@@ -335,6 +335,10 @@ the device &quot;%1&quot;?</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/ja/liblancard.ts b/i18n/ja/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/ja/liblancard.ts
+++ b/i18n/ja/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/liblockapplet.ts b/i18n/ja/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/ja/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libmailwrapper.ts b/i18n/ja/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/ja/libmailwrapper.ts
+++ b/i18n/ja/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/ja/libmemoryapplet.ts b/i18n/ja/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/ja/libmemoryapplet.ts
+++ b/i18n/ja/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/ja/libnetworksettings2.ts b/i18n/ja/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/ja/libnetworksettings2.ts
+++ b/i18n/ja/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/libopiemm2.ts b/i18n/ja/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/ja/libopiemm2.ts
+++ b/i18n/ja/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libopiepim2.ts b/i18n/ja/libopiepim2.ts
index 55cbf62..2a5182b 100644
--- a/i18n/ja/libopiepim2.ts
+++ b/i18n/ja/libopiepim2.ts
@@ -215,6 +215,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
@@ -604,6 +707,34 @@ and </source>
         <source>Sunday</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>
diff --git a/i18n/ja/libopiesecurity2.ts b/i18n/ja/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/ja/libopiesecurity2.ts
+++ b/i18n/ja/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/libopietooth2.ts b/i18n/ja/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/ja/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libopietooth2applet.ts b/i18n/ja/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/ja/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libopieui2.ts b/i18n/ja/libopieui2.ts
index 51a5983..cf55c5f 100644
--- a/i18n/ja/libopieui2.ts
+++ b/i18n/ja/libopieui2.ts
@@ -1,27 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>OTimePickerDialogBase</name>
     <message>
-        <source>FileDialog</source>
+        <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open</source>
+        <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select Directory</source>
+        <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
-        <source>Style</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -29,52 +29,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
-        <source>OTimePickerDialogBase</source>
+        <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time:</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>:</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pick Time:</source>
+        <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Internal::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Size</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
-        <source>Date</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Name:</source>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/libphasestyle.ts b/i18n/ja/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/ja/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libppp.ts b/i18n/ja/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/ja/libppp.ts
+++ b/i18n/ja/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/ja/libprofile.ts b/i18n/ja/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/ja/libprofile.ts
+++ b/i18n/ja/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/ja/libqpickboard.ts b/i18n/ja/libqpickboard.ts
index 488fb8f..694b19e 100644
--- a/i18n/ja/libqpickboard.ts
+++ b/i18n/ja/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libscreenshotapplet.ts b/i18n/ja/libscreenshotapplet.ts
index ebc9a78..b882fb9 100644
--- a/i18n/ja/libscreenshotapplet.ts
+++ b/i18n/ja/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/libtodayaddressbookplugin.ts b/i18n/ja/libtodayaddressbookplugin.ts
index fef7050..ca0b09b 100644
--- a/i18n/ja/libtodayaddressbookplugin.ts
+++ b/i18n/ja/libtodayaddressbookplugin.ts
@@ -2,10 +2,6 @@
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34,14 +30,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ja/libtodayexampleplugin.ts b/i18n/ja/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/ja/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libtodayweatherplugin.ts b/i18n/ja/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/ja/libtodayweatherplugin.ts
+++ b/i18n/ja/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/libvolumeapplet2.ts b/i18n/ja/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ja/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ja/libvpn.ts b/i18n/ja/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/ja/libvpn.ts
+++ b/i18n/ja/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/libwebstyle.ts b/i18n/ja/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/ja/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/libwlan.ts b/i18n/ja/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/ja/libwlan.ts
+++ b/i18n/ja/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/ja/main-tab.ts b/i18n/ja/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/ja/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/multiauth.ts b/i18n/ja/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ja/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ja/networksettings2.ts b/i18n/ja/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/ja/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/opie-console.ts b/i18n/ja/opie-console.ts
index d94b1ed..f6df35f 100644
--- a/i18n/ja/opie-console.ts
+++ b/i18n/ja/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <source>History</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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ja/opie-eye.ts b/i18n/ja/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/ja/opie-eye.ts
+++ b/i18n/ja/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/opie-eye_slave.ts b/i18n/ja/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/ja/opie-eye_slave.ts
+++ b/i18n/ja/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/opie-login.ts b/i18n/ja/opie-login.ts
index 7551ff5..f96e976 100644
--- a/i18n/ja/opie-login.ts
+++ b/i18n/ja/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -49,10 +45,6 @@ accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80,4 +72,51 @@ by an uncaught signal
         <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/ja/opie-sheet.ts b/i18n/ja/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/ja/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/opie-update-symlinks.ts b/i18n/ja/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ja/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ja/opieirc.ts b/i18n/ja/opieirc.ts
index 53bd5c4..b510840 100644
--- a/i18n/ja/opieirc.ts
+++ b/i18n/ja/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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: %1</source>
@@ -116,18 +127,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -148,10 +147,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -219,6 +214,103 @@
         <source>No such nickname</source>
         <translation type="unfinished"></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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Colors</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/ja/opiemail.ts b/i18n/ja/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/ja/opiemail.ts
+++ b/i18n/ja/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/ja/opieplayer2.ts b/i18n/ja/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/ja/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/ja/opierec.ts b/i18n/ja/opierec.ts
index c9416cf..dd0423b 100644
--- a/i18n/ja/opierec.ts
+++ b/i18n/ja/opierec.ts
@@ -21,10 +21,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37,14 +33,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,10 +65,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -101,10 +85,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Low Disk Space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -115,10 +95,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -176,5 +152,13 @@ the selected file?</source>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/opimconverter.ts b/i18n/ja/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/ja/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/osearch.ts b/i18n/ja/osearch.ts
index ed1df11..2446d75 100644
--- a/i18n/ja/osearch.ts
+++ b/i18n/ja/osearch.ts
@@ -46,10 +46,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -76,55 +76,55 @@
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
+        <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show</source>
+        <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>execute</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>open in filemanager</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>open with </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/oxygen.ts b/i18n/ja/oxygen.ts
index 19798b5..be515dc 100644
--- a/i18n/ja/oxygen.ts
+++ b/i18n/ja/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/ja/oyatzee.ts b/i18n/ja/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/ja/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/packagemanager.ts b/i18n/ja/packagemanager.ts
index 05d9dba..3b60785 100644
--- a/i18n/ja/packagemanager.ts
+++ b/i18n/ja/packagemanager.ts
@@ -1,11 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
-    <name>DataManager</name>
-</context>
-<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
@@ -47,9 +41,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InputDialog</name>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallDlg</name>
@@ -128,15 +159,6 @@
     </message>
 </context>
 <context>
-    <name>InstallDlgImpl</name>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-</context>
-<context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
@@ -147,119 +169,123 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
+        <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade</source>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download</source>
+        <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply changes</source>
+        <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
+        <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show packages not installed</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show installed packages</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show updated packages</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Packages</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -269,78 +295,86 @@ A blue dot next to the package name indicates that the package is currently inst
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -375,79 +409,201 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Depends</source>
+        <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Reinstall</source>
+        <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Remove</source>
+        <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Overwrite</source>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Errors only</source>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal messages</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Informative messages</source>
+        <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Troubleshooting output</source>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -482,17 +638,17 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-</context>
-<context>
-    <name>QObject</name>
-</context>
-<context>
-    <name>QuestionDlg</name>
-</context>
-<context>
-    <name>SettingsImpl</name>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/powerchord.ts b/i18n/ja/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/ja/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/ja/pyquicklauncher.ts b/i18n/ja/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ja/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ja/qpe.ts b/i18n/ja/qpe.ts
index bfab94d..8a704d2 100644
--- a/i18n/ja/qpe.ts
+++ b/i18n/ja/qpe.ts
@@ -242,6 +242,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -261,6 +268,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/ja/quicklauncher.ts b/i18n/ja/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ja/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ja/security.ts b/i18n/ja/security.ts
index 584fa09..ca86afe 100644
--- a/i18n/ja/security.ts
+++ b/i18n/ja/security.ts
@@ -70,47 +70,35 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -137,23 +125,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/sfcave-sdl.ts b/i18n/ja/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ja/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ja/sfcave.ts b/i18n/ja/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/ja/sfcave.ts
+++ b/i18n/ja/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/simple-icon.ts b/i18n/ja/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/ja/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/simple-main.ts b/i18n/ja/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/ja/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/simple-pim.ts b/i18n/ja/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/ja/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/simple.ts b/i18n/ja/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/ja/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/stocktickertest.ts b/i18n/ja/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/ja/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/sysinfo.ts b/i18n/ja/sysinfo.ts
index 1af3e2d..3528d42 100644
--- a/i18n/ja/sysinfo.ts
+++ b/i18n/ja/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -310,6 +306,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -345,5 +345,9 @@ to this process?</source>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Built against Qt/E </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/tableviewer.ts b/i18n/ja/tableviewer.ts
index 7d41b6f..4570c99 100644
--- a/i18n/ja/tableviewer.ts
+++ b/i18n/ja/tableviewer.ts
@@ -1,16 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
diff --git a/i18n/ja/textedit.ts b/i18n/ja/textedit.ts
index bfe526a..f26a284 100644
--- a/i18n/ja/textedit.ts
+++ b/i18n/ja/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/ja/today.ts b/i18n/ja/today.ts
index 97b11e2..60233b2 100644
--- a/i18n/ja/today.ts
+++ b/i18n/ja/today.ts
@@ -14,11 +14,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins found</source>
+        <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins activated</source>
+        <source>Today</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>
diff --git a/i18n/ja/todolist.ts b/i18n/ja/todolist.ts
index 6351fbb..4cf26d8 100644
--- a/i18n/ja/todolist.ts
+++ b/i18n/ja/todolist.ts
@@ -9,65 +9,68 @@
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Task Editor</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
     <message>
-        <source>Status</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>Opie Todolist</source>
+        <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter Task</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>silent</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>loud</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QWidget</name>
+    <name>Opie</name>
     <message>
-        <source>New from template</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Click here to create a new task.</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -75,46 +78,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
+        <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -131,18 +109,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -157,14 +123,6 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -222,10 +180,6 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ja/wellenreiter.ts b/i18n/ja/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/ja/wellenreiter.ts
+++ b/i18n/ja/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/ja/zlines.ts b/i18n/ja/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/ja/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/zsafe.ts b/i18n/ja/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/ja/zsafe.ts
+++ b/i18n/ja/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ja/zsame.ts b/i18n/ja/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/ja/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/advancedfm.ts b/i18n/ko/advancedfm.ts
index e7e44d6..70a4f46 100644
--- a/i18n/ko/advancedfm.ts
+++ b/i18n/ko/advancedfm.ts
@@ -14,17 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></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="unfinished"></translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -105,12 +94,6 @@ and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -163,11 +146,6 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -180,98 +158,107 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
+        <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1?</source>
+        <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File Exists!</source>
+        <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
+        <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy %1 to %2</source>
+        <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>to
-</source>
+        <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
+        <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> As</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
+        <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>Could not move
-</source>
+        <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>Could not copy 
-%1 
-to 
-%2</source>
+        <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AdvancedFm Output</source>
+        <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advancedfm Beam out</source>
+        <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ir sent.</source>
+        <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
+        <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not rename</source>
+        <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Yet Implemented</source>
+        <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>
diff --git a/i18n/ko/backup.ts b/i18n/ko/backup.ts
index 75e23eb..c6f598c 100644
--- a/i18n/ko/backup.ts
+++ b/i18n/ko/backup.ts
@@ -2,10 +2,6 @@
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
@@ -54,6 +50,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -66,10 +70,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,6 +113,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/ko/bartender.ts b/i18n/ko/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/ko/bartender.ts
+++ b/i18n/ko/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/ko/bluetooth-manager.ts b/i18n/ko/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/ko/bluetooth-manager.ts
+++ b/i18n/ko/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/ko/dagger.ts b/i18n/ko/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/ko/dagger.ts
+++ b/i18n/ko/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/ko/launchersettings.ts b/i18n/ko/launchersettings.ts
index 2ef3cd4..7c7d23c 100644
--- a/i18n/ko/launchersettings.ts
+++ b/i18n/ko/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/ko/libGPRS.ts b/i18n/ko/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/ko/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libaboutapplet.ts b/i18n/ko/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/ko/libaboutapplet.ts
+++ b/i18n/ko/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/ko/libbatteryapplet.ts b/i18n/ko/libbatteryapplet.ts
index 63d7afc..aeb2c4a 100644
--- a/i18n/ko/libbatteryapplet.ts
+++ b/i18n/ko/libbatteryapplet.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -62,27 +58,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
+        <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining: </source>
+        <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <source>Remaing Power: %1 %2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No jacket with battery inserted</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/libbluetooth.ts b/i18n/ko/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/ko/libbluetooth.ts
+++ b/i18n/ko/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libbrightnessapplet.ts b/i18n/ko/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ko/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ko/libcable.ts b/i18n/ko/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/ko/libcable.ts
+++ b/i18n/ko/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/libcardmonapplet.ts b/i18n/ko/libcardmonapplet.ts
index 3637f01..37329c3 100644
--- a/i18n/ko/libcardmonapplet.ts
+++ b/i18n/ko/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/libexample_applet.ts b/i18n/ko/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/ko/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libexample_board.ts b/i18n/ko/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/ko/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libexample_vpn.ts b/i18n/ko/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/ko/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libinterfaces.ts b/i18n/ko/libinterfaces.ts
index e871479..1a11276 100644
--- a/i18n/ko/libinterfaces.ts
+++ b/i18n/ko/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/ko/libkppp.ts b/i18n/ko/libkppp.ts
index bc82034..0982bb0 100644
--- a/i18n/ko/libkppp.ts
+++ b/i18n/ko/libkppp.ts
@@ -335,6 +335,10 @@ the device &quot;%1&quot;?</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/ko/liblancard.ts b/i18n/ko/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/ko/liblancard.ts
+++ b/i18n/ko/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/liblockapplet.ts b/i18n/ko/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/ko/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libmailwrapper.ts b/i18n/ko/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/ko/libmailwrapper.ts
+++ b/i18n/ko/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/ko/libmemoryapplet.ts b/i18n/ko/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/ko/libmemoryapplet.ts
+++ b/i18n/ko/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/ko/libnetworksettings2.ts b/i18n/ko/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/ko/libnetworksettings2.ts
+++ b/i18n/ko/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/libopiemm2.ts b/i18n/ko/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/ko/libopiemm2.ts
+++ b/i18n/ko/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libopiepim2.ts b/i18n/ko/libopiepim2.ts
index 55cbf62..2a5182b 100644
--- a/i18n/ko/libopiepim2.ts
+++ b/i18n/ko/libopiepim2.ts
@@ -215,6 +215,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
@@ -604,6 +707,34 @@ and </source>
         <source>Sunday</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>
diff --git a/i18n/ko/libopiesecurity2.ts b/i18n/ko/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/ko/libopiesecurity2.ts
+++ b/i18n/ko/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/libopietooth2.ts b/i18n/ko/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/ko/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libopietooth2applet.ts b/i18n/ko/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/ko/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libopieui2.ts b/i18n/ko/libopieui2.ts
index 51a5983..cf55c5f 100644
--- a/i18n/ko/libopieui2.ts
+++ b/i18n/ko/libopieui2.ts
@@ -1,27 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>OTimePickerDialogBase</name>
     <message>
-        <source>FileDialog</source>
+        <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open</source>
+        <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select Directory</source>
+        <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
-        <source>Style</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -29,52 +29,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
-        <source>OTimePickerDialogBase</source>
+        <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time:</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>:</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pick Time:</source>
+        <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Internal::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Size</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
-        <source>Date</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Name:</source>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/libphasestyle.ts b/i18n/ko/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/ko/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libppp.ts b/i18n/ko/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/ko/libppp.ts
+++ b/i18n/ko/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/ko/libprofile.ts b/i18n/ko/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/ko/libprofile.ts
+++ b/i18n/ko/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/ko/libqpickboard.ts b/i18n/ko/libqpickboard.ts
index 488fb8f..694b19e 100644
--- a/i18n/ko/libqpickboard.ts
+++ b/i18n/ko/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libscreenshotapplet.ts b/i18n/ko/libscreenshotapplet.ts
index ebc9a78..b882fb9 100644
--- a/i18n/ko/libscreenshotapplet.ts
+++ b/i18n/ko/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/libtodayaddressbookplugin.ts b/i18n/ko/libtodayaddressbookplugin.ts
index fef7050..ca0b09b 100644
--- a/i18n/ko/libtodayaddressbookplugin.ts
+++ b/i18n/ko/libtodayaddressbookplugin.ts
@@ -2,10 +2,6 @@
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34,14 +30,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ko/libtodayexampleplugin.ts b/i18n/ko/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/ko/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libtodayweatherplugin.ts b/i18n/ko/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/ko/libtodayweatherplugin.ts
+++ b/i18n/ko/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/libvolumeapplet2.ts b/i18n/ko/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ko/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ko/libvpn.ts b/i18n/ko/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/ko/libvpn.ts
+++ b/i18n/ko/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/libwebstyle.ts b/i18n/ko/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/ko/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/libwlan.ts b/i18n/ko/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/ko/libwlan.ts
+++ b/i18n/ko/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/ko/main-tab.ts b/i18n/ko/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/ko/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/multiauth.ts b/i18n/ko/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ko/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ko/networksettings2.ts b/i18n/ko/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/ko/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/opie-console.ts b/i18n/ko/opie-console.ts
index d94b1ed..f6df35f 100644
--- a/i18n/ko/opie-console.ts
+++ b/i18n/ko/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <source>History</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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ko/opie-eye.ts b/i18n/ko/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/ko/opie-eye.ts
+++ b/i18n/ko/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/opie-eye_slave.ts b/i18n/ko/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/ko/opie-eye_slave.ts
+++ b/i18n/ko/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/opie-login.ts b/i18n/ko/opie-login.ts
index 7551ff5..f96e976 100644
--- a/i18n/ko/opie-login.ts
+++ b/i18n/ko/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -49,10 +45,6 @@ accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80,4 +72,51 @@ by an uncaught signal
         <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/ko/opie-sheet.ts b/i18n/ko/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/ko/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/opie-update-symlinks.ts b/i18n/ko/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ko/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ko/opieirc.ts b/i18n/ko/opieirc.ts
index 53bd5c4..b510840 100644
--- a/i18n/ko/opieirc.ts
+++ b/i18n/ko/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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: %1</source>
@@ -116,18 +127,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -148,10 +147,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -219,6 +214,103 @@
         <source>No such nickname</source>
         <translation type="unfinished"></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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Colors</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/ko/opiemail.ts b/i18n/ko/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/ko/opiemail.ts
+++ b/i18n/ko/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/ko/opieplayer2.ts b/i18n/ko/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/ko/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/ko/opierec.ts b/i18n/ko/opierec.ts
index c9416cf..dd0423b 100644
--- a/i18n/ko/opierec.ts
+++ b/i18n/ko/opierec.ts
@@ -21,10 +21,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37,14 +33,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,10 +65,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -101,10 +85,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Low Disk Space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -115,10 +95,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -176,5 +152,13 @@ the selected file?</source>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/opimconverter.ts b/i18n/ko/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/ko/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/osearch.ts b/i18n/ko/osearch.ts
index ed1df11..2446d75 100644
--- a/i18n/ko/osearch.ts
+++ b/i18n/ko/osearch.ts
@@ -46,10 +46,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -76,55 +76,55 @@
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
+        <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show</source>
+        <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>execute</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>open in filemanager</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>open with </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/oxygen.ts b/i18n/ko/oxygen.ts
index 19798b5..be515dc 100644
--- a/i18n/ko/oxygen.ts
+++ b/i18n/ko/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/ko/oyatzee.ts b/i18n/ko/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/ko/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/packagemanager.ts b/i18n/ko/packagemanager.ts
index 05d9dba..3b60785 100644
--- a/i18n/ko/packagemanager.ts
+++ b/i18n/ko/packagemanager.ts
@@ -1,11 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
-    <name>DataManager</name>
-</context>
-<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
@@ -47,9 +41,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InputDialog</name>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallDlg</name>
@@ -128,15 +159,6 @@
     </message>
 </context>
 <context>
-    <name>InstallDlgImpl</name>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-</context>
-<context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
@@ -147,119 +169,123 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
+        <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade</source>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download</source>
+        <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply changes</source>
+        <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
+        <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show packages not installed</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show installed packages</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show updated packages</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Packages</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -269,78 +295,86 @@ A blue dot next to the package name indicates that the package is currently inst
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -375,79 +409,201 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Depends</source>
+        <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Reinstall</source>
+        <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Remove</source>
+        <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Overwrite</source>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Errors only</source>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal messages</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Informative messages</source>
+        <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Troubleshooting output</source>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -482,17 +638,17 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-</context>
-<context>
-    <name>QObject</name>
-</context>
-<context>
-    <name>QuestionDlg</name>
-</context>
-<context>
-    <name>SettingsImpl</name>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/powerchord.ts b/i18n/ko/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/ko/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/ko/pyquicklauncher.ts b/i18n/ko/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ko/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ko/qpe.ts b/i18n/ko/qpe.ts
index bfab94d..8a704d2 100644
--- a/i18n/ko/qpe.ts
+++ b/i18n/ko/qpe.ts
@@ -242,6 +242,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -261,6 +268,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/ko/quicklauncher.ts b/i18n/ko/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ko/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ko/security.ts b/i18n/ko/security.ts
index 584fa09..ca86afe 100644
--- a/i18n/ko/security.ts
+++ b/i18n/ko/security.ts
@@ -70,47 +70,35 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -137,23 +125,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/sfcave-sdl.ts b/i18n/ko/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ko/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ko/sfcave.ts b/i18n/ko/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/ko/sfcave.ts
+++ b/i18n/ko/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/simple-icon.ts b/i18n/ko/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/ko/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/simple-main.ts b/i18n/ko/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/ko/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/simple-pim.ts b/i18n/ko/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/ko/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/simple.ts b/i18n/ko/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/ko/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/stocktickertest.ts b/i18n/ko/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/ko/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/sysinfo.ts b/i18n/ko/sysinfo.ts
index 1af3e2d..3528d42 100644
--- a/i18n/ko/sysinfo.ts
+++ b/i18n/ko/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -310,6 +306,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -345,5 +345,9 @@ to this process?</source>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Built against Qt/E </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/tableviewer.ts b/i18n/ko/tableviewer.ts
index 7d41b6f..4570c99 100644
--- a/i18n/ko/tableviewer.ts
+++ b/i18n/ko/tableviewer.ts
@@ -1,16 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
diff --git a/i18n/ko/textedit.ts b/i18n/ko/textedit.ts
index bfe526a..f26a284 100644
--- a/i18n/ko/textedit.ts
+++ b/i18n/ko/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/ko/today.ts b/i18n/ko/today.ts
index 97b11e2..60233b2 100644
--- a/i18n/ko/today.ts
+++ b/i18n/ko/today.ts
@@ -14,11 +14,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins found</source>
+        <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins activated</source>
+        <source>Today</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>
diff --git a/i18n/ko/todolist.ts b/i18n/ko/todolist.ts
index 6351fbb..4cf26d8 100644
--- a/i18n/ko/todolist.ts
+++ b/i18n/ko/todolist.ts
@@ -9,65 +9,68 @@
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Task Editor</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
     <message>
-        <source>Status</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>Opie Todolist</source>
+        <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter Task</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>silent</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>loud</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QWidget</name>
+    <name>Opie</name>
     <message>
-        <source>New from template</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Click here to create a new task.</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -75,46 +78,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
+        <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -131,18 +109,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -157,14 +123,6 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -222,10 +180,6 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ko/wellenreiter.ts b/i18n/ko/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/ko/wellenreiter.ts
+++ b/i18n/ko/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/ko/zlines.ts b/i18n/ko/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/ko/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ko/zsafe.ts b/i18n/ko/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/ko/zsafe.ts
+++ b/i18n/ko/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/ko/zsame.ts b/i18n/ko/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/ko/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/.ts b/i18n/lv/.ts
index d79bbc9..d67f086 100644
--- a/i18n/lv/.ts
+++ b/i18n/lv/.ts
@@ -3,77 +3,65 @@
     <name>AccountPreferences</name>
     <message>
         <source>Account</source>
-        <translation>Konts</translation>
+        <translation type="obsolete">Konts</translation>
     </message>
 </context>
 <context>
     <name>DatePreferences</name>
     <message>
         <source>Date</source>
-        <translation>Datums</translation>
+        <translation type="obsolete">Datums</translation>
     </message>
 </context>
 <context>
     <name>MemoryDialog</name>
     <message>
         <source>Edit Memory</source>
-        <translation>Labot Atmiņu</translation>
+        <translation type="obsolete">Labot Atmiņu</translation>
     </message>
 </context>
 <context>
     <name>NewAccount</name>
     <message>
         <source>Account</source>
-        <translation>Konts</translation>
+        <translation type="obsolete">Konts</translation>
     </message>
     <message>
         <source>Child Account</source>
-        <translation>Bērna Konts</translation>
+        <translation type="obsolete">Bērna Konts</translation>
     </message>
     <message>
         <source>Bank</source>
-        <translation>Banka</translation>
+        <translation type="obsolete">Banka</translation>
     </message>
     <message>
         <source>Cash</source>
-        <translation>Nauda</translation>
+        <translation type="obsolete">Nauda</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation>Kredīt Karte</translation>
-    </message>
-    <message>
-        <source>Equity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Asset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liability</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Kredīt Karte</translation>
     </message>
 </context>
 <context>
     <name>NewTransaction</name>
     <message>
         <source>Transaction</source>
-        <translation>Tranzakcija</translation>
+        <translation type="obsolete">Tranzakcija</translation>
     </message>
 </context>
 <context>
     <name>QashMoney</name>
     <message>
         <source>QashMoney</source>
-        <translation>QashMoney</translation>
+        <translation type="obsolete">QashMoney</translation>
     </message>
 </context>
 <context>
     <name>TransactionPreferences</name>
     <message>
         <source>Transaction</source>
-        <translation>Tranzakcija</translation>
+        <translation type="obsolete">Tranzakcija</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/advancedfm.ts b/i18n/lv/advancedfm.ts
index 9c940c2..276770d 100644
--- a/i18n/lv/advancedfm.ts
+++ b/i18n/lv/advancedfm.ts
@@ -15,14 +15,14 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Šāda direktorija neeksistē</translation>
+        <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>Uzlabotais FailuMenedžeris
+        <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>
@@ -111,7 +111,7 @@ un ir licezēts ar GPL</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Nevaru izņemt tekošo direktoriju no grāmatzīmēm.  Tas nav iezīmēts!</translation>
+        <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>
@@ -168,7 +168,7 @@ It is not bookmarked!</source>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Vai tiešām dzēst
+        <translation type="obsolete">Vai tiešām dzēst
 %1 failus?</translation>
     </message>
     <message>
@@ -186,18 +186,18 @@ It is not bookmarked!</source>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Vai tiešām dzēst %1 un visu tā saturu ?</translation>
+        <translation type="obsolete">Vai tiešām dzēst %1 un visu tā saturu ?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Tiešām dzēst
+        <translation type="obsolete">Tiešām dzēst
 %1?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Tiešām kopēt
+        <translation type="obsolete">Tiešām kopēt
 %1 failus?</translation>
     </message>
     <message>
@@ -206,27 +206,27 @@ and all it&apos;s contents ?</source>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 eksistē. Tiešām pārrakstīt?</translation>
+        <translation type="obsolete">%1 eksistē. Tiešām pārrakstīt?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Nevaru kopēt %1 uz %2</translation>
+        <translation type="obsolete">Nevaru kopēt %1 uz %2</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 eksistē. Tiešām pārrakstīt?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>Nevaru nokopēt</translation>
+        <translation type="obsolete">Nevaru nokopēt</translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>uz
+        <translation type="obsolete">uz
 </translation>
     </message>
     <message>
@@ -240,20 +240,20 @@ eksistē. Tiešām pārrakstīt?</translation>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>jau eksistē
+        <translation type="obsolete">jau eksistē
 Vai tiešām vēlaties to dzēst?</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Nevaru pārvietot</translation>
+        <translation type="obsolete">Nevaru pārvietot</translation>
     </message>
     <message>
         <source>Could not copy 
 %1 
 to 
 %2</source>
-        <translation>Nevaru nokopēt
+        <translation type="obsolete">Nevaru nokopēt
 %1
 uz
 %2</translation>
@@ -286,6 +286,70 @@ uz
         <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 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>
diff --git a/i18n/lv/backup.ts b/i18n/lv/backup.ts
index 0822255..a0f64de 100644
--- a/i18n/lv/backup.ts
+++ b/i18n/lv/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Kopēšana un Atjaunošana... strādāju...</translation>
+        <translation type="obsolete">Kopēšana un Atjaunošana... strādāju...</translation>
     </message>
     <message>
         <source>Error from System:
@@ -55,6 +55,14 @@
         <source>Restore Successful.</source>
         <translation>Atjaunošana Pabeigta.</translation>
     </message>
+    <message>
+        <source>Backing up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Backup...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -68,7 +76,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Saglabāt Uz</translation>
+        <translation type="obsolete">Saglabāt Uz</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -118,6 +126,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/lv/bartender.ts b/i18n/lv/bartender.ts
index 5dfafa4..7a11011 100644
--- a/i18n/lv/bartender.ts
+++ b/i18n/lv/bartender.ts
@@ -90,7 +90,7 @@
     </message>
     <message>
         <source>Find by Alcohol</source>
-        <translation>Meklēt pēc Alkohola</translation>
+        <translation type="obsolete">Meklēt pēc Alkohola</translation>
     </message>
     <message>
         <source>Edit</source>
@@ -98,7 +98,7 @@
     </message>
     <message>
         <source>edit</source>
-        <translation>labot</translation>
+        <translation type="obsolete">labot</translation>
     </message>
     <message>
         <source>New</source>
@@ -138,7 +138,7 @@
     </message>
     <message>
         <source>Alcohol</source>
-        <translation>Alkohols</translation>
+        <translation type="obsolete">Alkohols</translation>
     </message>
     <message>
         <source>Search</source>
@@ -150,6 +150,23 @@
         <translation>Atvainojiet nav rezultātu priekš
 </translation>
     </message>
+    <message>
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/lv/bluetooth-manager.ts b/i18n/lv/bluetooth-manager.ts
index bb484af..fac959a 100644
--- a/i18n/lv/bluetooth-manager.ts
+++ b/i18n/lv/bluetooth-manager.ts
@@ -90,7 +90,7 @@
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
-        <translation>Bluetooth Pamata Konfigurācija</translation>
+        <translation type="obsolete">Bluetooth Pamata Konfigurācija</translation>
     </message>
     <message>
         <source>Default Passkey</source>
@@ -128,6 +128,10 @@
         <source>Status Label</source>
         <translation>Statusa Etiķete</translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/lv/dagger.ts b/i18n/lv/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/lv/dagger.ts
+++ b/i18n/lv/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/lv/launchersettings.ts b/i18n/lv/launchersettings.ts
index 920cb2d..3439bf4 100644
--- a/i18n/lv/launchersettings.ts
+++ b/i18n/lv/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation>Krāsa:</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>
diff --git a/i18n/lv/libGPRS.ts b/i18n/lv/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/lv/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libaboutapplet.ts b/i18n/lv/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/lv/libaboutapplet.ts
+++ b/i18n/lv/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/lv/libbatteryapplet.ts b/i18n/lv/libbatteryapplet.ts
index 63d7afc..aeb2c4a 100644
--- a/i18n/lv/libbatteryapplet.ts
+++ b/i18n/lv/libbatteryapplet.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -62,27 +58,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
+        <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining: </source>
+        <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <source>Remaing Power: %1 %2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No jacket with battery inserted</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/lv/libbluetooth.ts b/i18n/lv/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/lv/libbluetooth.ts
+++ b/i18n/lv/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/lv/libbrightnessapplet.ts b/i18n/lv/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/lv/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/lv/libcable.ts b/i18n/lv/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/lv/libcable.ts
+++ b/i18n/lv/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/lv/libcardmonapplet.ts b/i18n/lv/libcardmonapplet.ts
index 3637f01..37329c3 100644
--- a/i18n/lv/libcardmonapplet.ts
+++ b/i18n/lv/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/libexample_applet.ts b/i18n/lv/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/lv/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libexample_board.ts b/i18n/lv/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/lv/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libexample_vpn.ts b/i18n/lv/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/lv/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libinterfaces.ts b/i18n/lv/libinterfaces.ts
index e871479..1a11276 100644
--- a/i18n/lv/libinterfaces.ts
+++ b/i18n/lv/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/lv/libkppp.ts b/i18n/lv/libkppp.ts
index ea4fc5b..92aa87e 100644
--- a/i18n/lv/libkppp.ts
+++ b/i18n/lv/libkppp.ts
@@ -342,6 +342,10 @@ the device &quot;%1&quot;?</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/lv/liblancard.ts b/i18n/lv/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/lv/liblancard.ts
+++ b/i18n/lv/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/lv/liblockapplet.ts b/i18n/lv/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/lv/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libmailwrapper.ts b/i18n/lv/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/lv/libmailwrapper.ts
+++ b/i18n/lv/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/lv/libmemoryapplet.ts b/i18n/lv/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/lv/libmemoryapplet.ts
+++ b/i18n/lv/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/lv/libnetworksettings2.ts b/i18n/lv/libnetworksettings2.ts
index 557b39e..efd2625 100644
--- a/i18n/lv/libnetworksettings2.ts
+++ b/i18n/lv/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <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>
@@ -34,11 +42,35 @@
     </message>
     <message>
         <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Tīkla vietas kas strādā ar IP savienojumiem&lt;/p&gt;</translation>
+        <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>&lt;p&gt;Pilnībā konfigurēts savienojuma profils&lt;/p&gt;</translation>
+        <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>
@@ -57,7 +89,7 @@
     </message>
     <message>
         <source>Off</source>
-        <translation>Izslēgts</translation>
+        <translation type="obsolete">Izslēgts</translation>
     </message>
     <message>
         <source>Available</source>
@@ -65,7 +97,15 @@
     </message>
     <message>
         <source>IsUp</source>
-        <translation>IrAugšā</translation>
+        <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/libopiemm2.ts b/i18n/lv/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/lv/libopiemm2.ts
+++ b/i18n/lv/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/lv/libopiepim2.ts b/i18n/lv/libopiepim2.ts
index e5b1f2a..59d1690 100644
--- a/i18n/lv/libopiepim2.ts
+++ b/i18n/lv/libopiepim2.ts
@@ -216,6 +216,109 @@ un</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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
@@ -605,6 +708,34 @@ un</translation>
         <source>Sunday</source>
         <translation>Svētdienu</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>
diff --git a/i18n/lv/libopiesecurity2.ts b/i18n/lv/libopiesecurity2.ts
index eefa8a5..71cc93e 100644
--- a/i18n/lv/libopiesecurity2.ts
+++ b/i18n/lv/libopiesecurity2.ts
@@ -3,7 +3,7 @@
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
         <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation>Laipni lūgti Opie Multi-autentifikācijas sadaļā</translation>
+        <translation type="obsolete">Laipni lūgti Opie Multi-autentifikācijas sadaļā</translation>
     </message>
     <message>
         <source>Launching authentication plugins...</source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation>Piezīme: patiesai aizsardzībai poga &apos;iziet&apos; ir jāizņem</translation>
+        <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>
@@ -23,11 +23,27 @@
     </message>
     <message>
         <source>You have not succeeded enough authentication steps!</source>
-        <translation>Jums neizdevās iziet visus autentifikācijas soļus!</translation>
+        <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>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>
+        <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 type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/i18n/lv/libopietooth2.ts b/i18n/lv/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/lv/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libopietooth2applet.ts b/i18n/lv/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/lv/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libopieui2.ts b/i18n/lv/libopieui2.ts
index f8b3efd..8b8a129 100644
--- a/i18n/lv/libopieui2.ts
+++ b/i18n/lv/libopieui2.ts
@@ -3,34 +3,34 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>FailuDialogs</translation>
+        <translation type="obsolete">FailuDialogs</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Atvērt</translation>
+        <translation type="obsolete">Atvērt</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Saglabāt</translation>
+        <translation type="obsolete">Saglabāt</translation>
     </message>
     <message>
         <source>Select Directory</source>
-        <translation>Izvēlēties Katalogu</translation>
+        <translation type="obsolete">Izvēlēties Katalogu</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stils</translation>
+        <translation type="obsolete">Stils</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Izmērs</translation>
+        <translation type="obsolete">Izmērs</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Glāžšķūņu utt</translation>
+        <translation type="obsolete">Glāžšķūņu utt</translation>
     </message>
 </context>
 <context>
@@ -75,19 +75,19 @@
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">FailuDialogs</translation>
+        <translation type="unfinished">FailuDialogs</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Atvērt</translation>
+        <translation type="unfinished">Atvērt</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Saglabāt</translation>
+        <translation type="unfinished">Saglabāt</translation>
     </message>
     <message>
         <source>Select Directory</source>
-        <translation type="obsolete">Izvēlēties Katalogu</translation>
+        <translation type="unfinished">Izvēlēties Katalogu</translation>
     </message>
 </context>
 <context>
@@ -101,15 +101,15 @@
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Stils</translation>
+        <translation type="unfinished">Stils</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Izmērs</translation>
+        <translation type="unfinished">Izmērs</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Glāžšķūņu utt</translation>
+        <translation type="unfinished">Glāžšķūņu utt</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/lv/libphasestyle.ts b/i18n/lv/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/lv/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libppp.ts b/i18n/lv/libppp.ts
index 772a7b6..96567a6 100644
--- a/i18n/lv/libppp.ts
+++ b/i18n/lv/libppp.ts
@@ -124,6 +124,45 @@
     </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>
@@ -141,24 +180,32 @@
         <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>Nepieciešama IPAdrese</translation>
+        <translation type="obsolete">Nepieciešama IPAdrese</translation>
     </message>
     <message>
         <source>IPAddress not valid</source>
-        <translation>IPAdrese nav pareiza</translation>
+        <translation type="obsolete">IPAdrese nav pareiza</translation>
     </message>
     <message>
         <source>Subnet mask needed</source>
-        <translation>Nepieciešama Subnet maska</translation>
+        <translation type="obsolete">Nepieciešama Subnet maska</translation>
     </message>
     <message>
         <source>Subnet mask not valid</source>
-        <translation>Nav pareiza Subnet maska</translation>
+        <translation type="obsolete">Nav pareiza Subnet maska</translation>
     </message>
     <message>
         <source>Gateway address needed</source>
@@ -189,7 +236,7 @@
     </message>
     <message>
         <source>Subnetmask</source>
-        <translation>Tīkla maska</translation>
+        <translation type="obsolete">Tīkla maska</translation>
     </message>
     <message>
         <source>Address</source>
@@ -203,16 +250,66 @@
         <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>PPP Konekcija</translation>
+        <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 69fe211..fe2c3bb 100644
--- a/i18n/lv/libprofile.ts
+++ b/i18n/lv/libprofile.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>Disabled</source>
-        <translation>Aizliegts</translation>
+        <translation type="obsolete">Aizliegts</translation>
     </message>
     <message>
         <source>Trigger VPN</source>
@@ -111,11 +111,11 @@
     </message>
     <message>
         <source>Transmitting</source>
-        <translation>Pāraide</translation>
+        <translation type="obsolete">Pāraide</translation>
     </message>
     <message>
         <source>Others</source>
-        <translation>Citi</translation>
+        <translation type="obsolete">Citi</translation>
     </message>
     <message>
         <source>Collisions</source>
@@ -125,6 +125,30 @@
         <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>
diff --git a/i18n/lv/libqpe.ts b/i18n/lv/libqpe.ts
index cf1361a..42bd097 100644
--- a/i18n/lv/libqpe.ts
+++ b/i18n/lv/libqpe.ts
@@ -317,7 +317,7 @@ labo kategorijas.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dzēst</translation>
     </message>
     <message>
         <source>Delete this document.</source>
@@ -558,11 +558,11 @@ Free some memory and try again.</source>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Visi</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Neaizpildīts</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
@@ -897,7 +897,7 @@ Free some memory and try again.</source>
     </message>
     <message>
         <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cietais Disks</translation>
     </message>
     <message>
         <source>SD Card</source>
diff --git a/i18n/lv/libqpickboard.ts b/i18n/lv/libqpickboard.ts
index 186bb75..e286e91 100644
--- a/i18n/lv/libqpickboard.ts
+++ b/i18n/lv/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Izvēles dēlis</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/lv/libscreenshotapplet.ts b/i18n/lv/libscreenshotapplet.ts
index ebc9a78..b882fb9 100644
--- a/i18n/lv/libscreenshotapplet.ts
+++ b/i18n/lv/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/libtodayaddressbookplugin.ts b/i18n/lv/libtodayaddressbookplugin.ts
index fee4ee9..339d338 100644
--- a/i18n/lv/libtodayaddressbookplugin.ts
+++ b/i18n/lv/libtodayaddressbookplugin.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPluginConfig</name>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Lai aktivizētu uzstādījumus: Pārstartējiet aplikāciju !</translation>
+        <translation type="obsolete">Lai aktivizētu uzstādījumus: Pārstartējiet aplikāciju !</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
@@ -35,11 +35,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Klip līnija pēc X simbola:</translation>
+        <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>Pēc cik simboliem uzdevuma info ir jāapgriež</translation>
+        <translation type="obsolete">Pēc cik simboliem uzdevuma info ir jāapgriež</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
diff --git a/i18n/lv/libtodayexampleplugin.ts b/i18n/lv/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/lv/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libtodayweatherplugin.ts b/i18n/lv/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/lv/libtodayweatherplugin.ts
+++ b/i18n/lv/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/lv/libvolumeapplet2.ts b/i18n/lv/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/lv/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/lv/libvpn.ts b/i18n/lv/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/lv/libvpn.ts
+++ b/i18n/lv/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/lv/libwebstyle.ts b/i18n/lv/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/lv/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/libwlan.ts b/i18n/lv/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/lv/libwlan.ts
+++ b/i18n/lv/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/lv/main-tab.ts b/i18n/lv/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/lv/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/multiauth.ts b/i18n/lv/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/lv/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/lv/networksettings2.ts b/i18n/lv/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/lv/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/opie-console.ts b/i18n/lv/opie-console.ts
index d94b1ed..f6df35f 100644
--- a/i18n/lv/opie-console.ts
+++ b/i18n/lv/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <source>History</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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/lv/opie-eye.ts b/i18n/lv/opie-eye.ts
index 187ea3f..0083bd9 100644
--- a/i18n/lv/opie-eye.ts
+++ b/i18n/lv/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,12 +91,16 @@
         <source>Image</source>
         <translation>Attēls</translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
         <source>Phunk View - Config</source>
-        <translation>Phunk Skats - Konfigurēšana</translation>
+        <translation type="obsolete">Phunk Skats - Konfigurēšana</translation>
     </message>
     <message>
         <source>Browser Keyboard Actions</source>
@@ -48,6 +110,102 @@
         <source>Keyboard Configuration</source>
         <translation>Klaviatūras Konfigurācija</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>
 </context>
 <context>
     <name>QObject</name>
@@ -58,7 +216,7 @@
     </message>
     <message>
         <source>Opie Eye Caramba</source>
-        <translation>Opie Acs Caramba</translation>
+        <translation type="obsolete">Opie Acs Caramba</translation>
     </message>
     <message>
         <source>Show all files</source>
@@ -66,7 +224,77 @@
     </message>
     <message>
         <source>DirView</source>
-        <translation>KataloguSkats</translation>
+        <translation type="obsolete">KataloguSkats</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>
+</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/lv/opie-eye_slave.ts b/i18n/lv/opie-eye_slave.ts
index b58261f..f617d74 100644
--- a/i18n/lv/opie-eye_slave.ts
+++ b/i18n/lv/opie-eye_slave.ts
@@ -155,154 +155,136 @@
     <message>
         <source>Colormode: Color
 </source>
-        <translation>Krāsurežīms: Krāsa</translation>
+        <translation type="obsolete">Krāsurežīms: Krāsa</translation>
     </message>
     <message>
         <source>Colormode: Black and white
 </source>
-        <translation>Krāsurežīms: Melnbalts
+        <translation type="obsolete">Krāsurežīms: Melnbalts
 </translation>
     </message>
     <message>
         <source>Basic</source>
-        <translation>Pamata</translation>
+        <translation type="obsolete">Pamata</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation>Normāls</translation>
+        <translation type="obsolete">Normāls</translation>
     </message>
     <message>
         <source>Fine</source>
-        <translation>Precīzi</translation>
+        <translation type="obsolete">Precīzi</translation>
     </message>
     <message>
         <source>Quality: %1
 </source>
-        <translation>Kvalitāte: %1
+        <translation type="obsolete">Kvalitāte: %1
 </translation>
     </message>
     <message>
         <source>Daylight</source>
-        <translation>Dienasgaisma</translation>
+        <translation type="obsolete">Dienasgaisma</translation>
     </message>
     <message>
         <source>Fluorescent</source>
-        <translation>Fluroscents</translation>
+        <translation type="obsolete">Fluroscents</translation>
     </message>
     <message>
         <source>Tungsten</source>
-        <translation>Tungsten</translation>
+        <translation type="obsolete">Tungsten</translation>
     </message>
     <message>
         <source>Standard light A</source>
-        <translation>Standarta gaišs A</translation>
+        <translation type="obsolete">Standarta gaišs A</translation>
     </message>
     <message>
         <source>Standard light B</source>
-        <translation>Standarta gaišs B</translation>
+        <translation type="obsolete">Standarta gaišs B</translation>
     </message>
     <message>
         <source>Standard light C</source>
-        <translation>Standarta gaišs C</translation>
+        <translation type="obsolete">Standarta gaišs C</translation>
     </message>
     <message>
         <source>D55</source>
-        <translation>D55</translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation></translation>
+        <translation type="obsolete">D55</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Cits</translation>
+        <translation type="obsolete">Cits</translation>
     </message>
     <message>
         <source>White Balance: %1
 </source>
-        <translation>Baltā Balanss: %1
+        <translation type="obsolete">Baltā Balanss: %1
 </translation>
     </message>
     <message>
         <source>Average</source>
-        <translation>Vidēji</translation>
+        <translation type="obsolete">Vidēji</translation>
     </message>
     <message>
         <source>Center weighted average</source>
-        <translation>Centrāli izvērti vidējais</translation>
+        <translation type="obsolete">Centrāli izvērti vidējais</translation>
     </message>
     <message>
         <source>Spot</source>
-        <translation>Punkts</translation>
+        <translation type="obsolete">Punkts</translation>
     </message>
     <message>
         <source>MultiSpot</source>
-        <translation>Daudzpunktu</translation>
+        <translation type="obsolete">Daudzpunktu</translation>
     </message>
     <message>
         <source>Pattern</source>
-        <translation>Raksts</translation>
+        <translation type="obsolete">Raksts</translation>
     </message>
     <message>
         <source>Partial</source>
-        <translation>Daļējs</translation>
+        <translation type="obsolete">Daļējs</translation>
     </message>
     <message>
         <source>Metering Mode: %1
 </source>
-        <translation>Matering Režīms: %1
+        <translation type="obsolete">Matering Režīms: %1
 </translation>
     </message>
     <message>
         <source>Not defined</source>
-        <translation>Nav definēts</translation>
+        <translation type="obsolete">Nav definēts</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation>Rokas</translation>
+        <translation type="obsolete">Rokas</translation>
     </message>
     <message>
         <source>Normal progam</source>
-        <translation>Normāla programma</translation>
+        <translation type="obsolete">Normāla programma</translation>
     </message>
     <message>
         <source>Aperture priority</source>
-        <translation>Atklāšanas prioritāte</translation>
+        <translation type="obsolete">Atklāšanas prioritāte</translation>
     </message>
     <message>
         <source>Shutter priority</source>
-        <translation>Aizklāšanas prioritāte</translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation></translation>
+        <translation type="obsolete">Aizklāšanas prioritāte</translation>
     </message>
     <message>
         <source>Portrait mode
 (for closeup photos with the background out of focus)</source>
-        <translation>Portreta režīms
+        <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>Ainavas režīms
+        <translation type="obsolete">Ainavas režīms
 (ainavu atēliem)</translation>
     </message>
     <message>
         <source>Exposure Program: %1
 </source>
-        <translation>Attīstīšanas Programma: %1
+        <translation type="obsolete">Attīstīšanas Programma: %1
 </translation>
     </message>
     <message>
@@ -393,5 +375,29 @@
         <source>&lt;/qt&gt;</source>
         <translation></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/lv/opie-login.ts b/i18n/lv/opie-login.ts
index 7551ff5..f96e976 100644
--- a/i18n/lv/opie-login.ts
+++ b/i18n/lv/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -49,10 +45,6 @@ accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80,4 +72,51 @@ by an uncaught signal
         <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/lv/opie-sheet.ts b/i18n/lv/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/lv/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/opie-update-symlinks.ts b/i18n/lv/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/lv/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/lv/opieirc.ts b/i18n/lv/opieirc.ts
index 53bd5c4..b510840 100644
--- a/i18n/lv/opieirc.ts
+++ b/i18n/lv/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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: %1</source>
@@ -116,18 +127,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -148,10 +147,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -219,6 +214,103 @@
         <source>No such nickname</source>
         <translation type="unfinished"></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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Colors</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/lv/opiemail.ts b/i18n/lv/opiemail.ts
index 919655d..b534b8d 100644
--- a/i18n/lv/opiemail.ts
+++ b/i18n/lv/opiemail.ts
@@ -80,7 +80,7 @@
     </message>
     <message>
         <source>No Receiver spezified</source>
-        <translation>Nav norādīts saņēmējs</translation>
+        <translation type="obsolete">Nav norādīts saņēmējs</translation>
     </message>
     <message>
         <source>Store message</source>
@@ -102,6 +102,10 @@
         <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 type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
@@ -367,7 +371,7 @@
         <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>Šeit ievadiet atlases kritēriju.
+        <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>
@@ -379,6 +383,12 @@ tika kopas ar šo filtru.</translation>
         <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 type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
@@ -535,6 +545,18 @@ tika kopas ar šo filtru.</translation>
         <source>Password</source>
         <translation>Parole</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>
@@ -726,12 +748,16 @@ tika kopas ar šo filtru.</translation>
         <source>Display image preview</source>
         <translation>Rādīt attēla pirmsskatu</translation>
     </message>
+    <message>
+        <source>E-Mail by %1</source>
+        <translation type="unfinished">E-Pasts no %1</translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
-        <translation>E-Pasts no %1</translation>
+        <translation type="obsolete">E-Pasts no %1</translation>
     </message>
     <message>
         <source>Mail</source>
@@ -769,6 +795,10 @@ tika kopas ar šo filtru.</translation>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/lv/opieplayer2.ts b/i18n/lv/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/lv/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/lv/opierec.ts b/i18n/lv/opierec.ts
index c9416cf..dd0423b 100644
--- a/i18n/lv/opierec.ts
+++ b/i18n/lv/opierec.ts
@@ -21,10 +21,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37,14 +33,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,10 +65,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -101,10 +85,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Low Disk Space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -115,10 +95,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -176,5 +152,13 @@ the selected file?</source>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/opimconverter.ts b/i18n/lv/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/lv/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/osearch.ts b/i18n/lv/osearch.ts
index 232e989..0aaabfc 100644
--- a/i18n/lv/osearch.ts
+++ b/i18n/lv/osearch.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Reģistrjūtīgs</translation>
+        <translation type="obsolete">Reģistrjūtīgs</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -65,6 +65,10 @@
         <source></source>
         <translation></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -77,15 +81,15 @@
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
-        <translation>rādīt pabeigtos uzdevumus</translation>
+        <translation type="obsolete">rādīt pabeigtos uzdevumus</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>rādīt pagājušos notikumus</translation>
+        <translation type="obsolete">rādīt pagājušos notikumus</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>meklēt datumos</translation>
+        <translation type="obsolete">meklēt datumos</translation>
     </message>
     <message>
         <source>show</source>
@@ -121,11 +125,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>meklēšanas konteksts</translation>
+        <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 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/lv/oxygen.ts b/i18n/lv/oxygen.ts
index 19798b5..be515dc 100644
--- a/i18n/lv/oxygen.ts
+++ b/i18n/lv/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/lv/oyatzee.ts b/i18n/lv/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/lv/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/packagemanager.ts b/i18n/lv/packagemanager.ts
index 50eb9f6..d20328c 100644
--- a/i18n/lv/packagemanager.ts
+++ b/i18n/lv/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation>Instalētas iekārtā no:</translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -252,7 +292,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Klikšķiniet šeit, lai atjaunotu paku sarakstus no serveriem.</translation>
+        <translation type="obsolete">Klikšķiniet šeit, lai atjaunotu paku sarakstus no serveriem.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -260,7 +300,7 @@
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>Klikšķiniet šeit lai atjaunotu visas instalētās pakas uz jaunāko pieejamo versiju.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai atjaunotu visas instalētās pakas uz jaunāko pieejamo versiju.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -268,7 +308,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Klikšķiniet šeit, lai lejuplādētu iezīmētās pakas.</translation>
+        <translation type="obsolete">Klikšķiniet šeit, lai lejuplādētu iezīmētās pakas.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -276,7 +316,7 @@
     </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 atjaunotu iezīmētās pakotnes.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai instalētu, izņemtu vai atjaunotu iezīmētās pakotnes.</translation>
     </message>
     <message>
         <source>Configure</source>
@@ -284,7 +324,7 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Klikšķiniet šeit lai konfigurētu šo aplikāciju.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai konfigurētu šo aplikāciju.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -296,7 +336,7 @@
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>Klikšķiniet šeit lai rādītu pakotnes kuras vēl nav instalētas.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai rādītu pakotnes kuras vēl nav instalētas.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -304,7 +344,7 @@
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>Klikšķiniet šeit, lai rādītu pakotnes kuras ir instalētas uz šīs iekārtas.</translation>
+        <translation type="obsolete">Klikšķiniet šeit, lai rādītu pakotnes kuras ir instalētas uz šīs iekārtas.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -312,7 +352,7 @@
     </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 uz šīs iekārtas instalētās pakotnes kurām ir pieejama jaunāka versija.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai rādītu uz šīs iekārtas instalētās pakotnes kurām ir pieejama jaunāka versija.</translation>
     </message>
     <message>
         <source>Find</source>
@@ -320,7 +360,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Klikšķiniet šeit, lai  meklētu tekstu pakotnes nosaukumos.</translation>
+        <translation type="obsolete">Klikšķiniet šeit, lai  meklētu tekstu pakotnes nosaukumos.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -328,7 +368,7 @@
     </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 pakotni kura satur iepriekš meklēto tekstu.</translation>
+        <translation type="obsolete">Klikšķiniet šeit, lai meklētu nākamo pakotni kura satur iepriekš meklēto tekstu.</translation>
     </message>
     <message>
         <source>View</source>
@@ -336,7 +376,7 @@
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Klikšķiniet šeit lai noslēptu meklēšanas komandrindu.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai noslēptu meklēšanas komandrindu.</translation>
     </message>
     <message>
         <source>Packages</source>
@@ -374,7 +414,7 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation type="unfinished">Šis ir visu pakotņu saraksts.
+        <translation type="obsolete">Šis ir visu pakotņu saraksts.
 
 Zilais punkts blakus pakotnes nosaukumam norāda, ka pakotne ir instalēta.
 
@@ -387,18 +427,10 @@ Klikšķiniet uz kvadrāta kreisajā pusē, lai atzīmētu pakotni.</translation
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -438,70 +470,124 @@ Klikšķiniet uz kvadrāta kreisajā pusē, lai atzīmētu pakotni.</translation
         <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>This is a listing of all packages.
+
+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.
+
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OIpkgConfigDlg</name>
     <message>
-        <source>Configuration</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Servers</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Destinations</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="unfinished">Opcijas</translation>
+        <source>Tap here to configure this application.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>Tap here to change the package filter criteria.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to search for text in package names.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkg</name>
+    <message>
+        <source>Linking packages installed in: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Links removed for: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgConfigDlg</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Options</source>
+        <translation type="unfinished">Opcijas</translation>
+    </message>
+    <message>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -560,6 +646,148 @@ Klikšķiniet uz kvadrāta kreisajā pusē, lai atzīmētu pakotni.</translation
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -592,6 +820,18 @@ Klikšķiniet uz kvadrāta kreisajā pusē, lai atzīmētu pakotni.</translation
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/lv/powerchord.ts b/i18n/lv/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/lv/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/lv/pyquicklauncher.ts b/i18n/lv/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/lv/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/lv/qpe.ts b/i18n/lv/qpe.ts
index 07a75ac..8e05326 100644
--- a/i18n/lv/qpe.ts
+++ b/i18n/lv/qpe.ts
@@ -247,6 +247,13 @@ akurāti kalibrējiet ekrānu.</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>
@@ -266,6 +273,13 @@ akurāti kalibrējiet ekrānu.</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>
diff --git a/i18n/lv/security.ts b/i18n/lv/security.ts
index 40eb169..ec27849 100644
--- a/i18n/lv/security.ts
+++ b/i18n/lv/security.ts
@@ -76,7 +76,7 @@ Jūs varat izvēlēties konfigurētu lietotāju.</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation>&lt;p&gt;Visi lieotāju-definēti diapazoni pazudīs.</translation>
+        <translation type="obsolete">&lt;p&gt;Visi lieotāju-definēti diapazoni pazudīs.</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -84,39 +84,35 @@ Jūs varat izvēlēties konfigurētu lietotāju.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Labi</translation>
+        <translation type="obsolete">Labi</translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation></translation>
+        <source>Any</source>
+        <translation>Visi</translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
-        <translation></translation>
+        <source>None</source>
+        <translation>Neviens</translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
-        <translation></translation>
+        <source>Important notice</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
-        <translation></translation>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
-        <translation></translation>
+        <source>Locking</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
-        <translation>Visi</translation>
+        <source>All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Neviens</translation>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -143,7 +139,7 @@ Jūs varat izvēlēties konfigurētu lietotāju.</translation>
     </message>
     <message>
         <source>Debug options</source>
-        <translation>Atblusošanas opcijas</translation>
+        <translation type="obsolete">Atblusošanas opcijas</translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
@@ -155,11 +151,43 @@ Jūs varat izvēlēties konfigurētu lietotāju.</translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
-        <translation>Atļaut izlaist autentifikāciju</translation>
+        <translation type="obsolete">Atļaut izlaist autentifikāciju</translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
-        <translation>Piezīme: trešā opcija ietekmē otro</translation>
+        <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>
diff --git a/i18n/lv/sfcave-sdl.ts b/i18n/lv/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/lv/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/lv/sfcave.ts b/i18n/lv/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/lv/sfcave.ts
+++ b/i18n/lv/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/lv/simple-icon.ts b/i18n/lv/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/lv/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/simple-main.ts b/i18n/lv/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/lv/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/simple-pim.ts b/i18n/lv/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/lv/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/simple.ts b/i18n/lv/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/lv/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/stocktickertest.ts b/i18n/lv/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/lv/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/sysinfo.ts b/i18n/lv/sysinfo.ts
index fcb70e8..72e3404 100644
--- a/i18n/lv/sysinfo.ts
+++ b/i18n/lv/sysinfo.ts
@@ -65,10 +65,6 @@
         <source>error</source>
         <translation>kļūda</translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -327,6 +323,10 @@ to this process?</source>
         <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>
@@ -362,5 +362,9 @@ to this process?</source>
         <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 2cdd9f8..1b5d055 100644
--- a/i18n/lv/tableviewer.ts
+++ b/i18n/lv/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Nevaru izveidot noklusēto vērtību tipam %1, Atslēga nav pievienota.</translation>
+        <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>DataElem:setField(%1, %2) Nav atrasts derīgs tips</translation>
+        <translation type="obsolete">DataElem:setField(%1, %2) Nav atrasts derīgs tips</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/lv/textedit.ts b/i18n/lv/textedit.ts
index 07147ca..3ca9754 100644
--- a/i18n/lv/textedit.ts
+++ b/i18n/lv/textedit.ts
@@ -200,6 +200,10 @@ Vai saglabāt?</translation>
         <source>Not enough lines</source>
         <translation>Nepietiek rindu</translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/lv/today.ts b/i18n/lv/today.ts
index 2d0cf23..acd4b32 100644
--- a/i18n/lv/today.ts
+++ b/i18n/lv/today.ts
@@ -15,12 +15,24 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Nav atrasti spraudņi</translation>
+        <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 type="unfinished">Šodien</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>
diff --git a/i18n/lv/todolist.ts b/i18n/lv/todolist.ts
index 8a08abe..21e27b8 100644
--- a/i18n/lv/todolist.ts
+++ b/i18n/lv/todolist.ts
@@ -9,6 +9,29 @@
         <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>
@@ -34,10 +57,21 @@
     </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>Opie Uzdevumi</translation>
+        <translation type="obsolete">Opie Uzdevumi</translation>
     </message>
     <message>
         <source>Enter Task</source>
@@ -60,39 +94,39 @@
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Jauns no sagataves</translation>
+        <translation type="obsolete">Jauns no sagataves</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Jauns Uzdevums</translation>
+        <translation type="obsolete">Jauns Uzdevums</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Klikšķiniet šeit lai izveidotu jaunu uzdevumu.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai izveidotu jaunu uzdevumu.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Labot Uzdevumu</translation>
+        <translation type="obsolete">Labot Uzdevumu</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Klikšķiniet šeit lai labotu tekošo uzdevumu.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai labotu tekošo uzdevumu.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Skatīt Uzdevumu</translation>
+        <translation type="obsolete">Skatīt Uzdevumu</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Dzēst...</translation>
+        <translation type="obsolete">Dzēst...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Klikšķiniet šeit lai dzēstu tekošo uzdevumu.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai dzēstu tekošo uzdevumu.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Dzēst visu...</translation>
+        <translation type="obsolete">Dzēst visu...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,19 +134,19 @@
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Pavairot</translation>
+        <translation type="obsolete">Pavairot</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Bīmot</translation>
+        <translation type="obsolete">Bīmot</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Klikšķiniet šeit lai nosūtītu uzdevumu uz citu iekārtu.</translation>
+        <translation type="obsolete">Klikšķiniet šeit lai nosūtītu uzdevumu uz citu iekārtu.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Meklēt</translation>
+        <translation type="obsolete">Meklēt</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -132,15 +166,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Dati</translation>
+        <translation type="obsolete">Dati</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorija</translation>
+        <translation type="obsolete">Kategorija</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opcijas</translation>
+        <translation type="obsolete">Opcijas</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -164,11 +198,11 @@ Saraksts attēlo sekojošu informāciju:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Visas Kategorijas</translation>
+        <translation type="obsolete">Visas Kategorijas</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Neaizpildīts</translation>
+        <translation type="obsolete">Neaizpildīts</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -234,7 +268,7 @@ Vai Begit?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Konfigurēt Sagataves</translation>
+        <translation type="obsolete">Konfigurēt Sagataves</translation>
     </message>
     <message>
         <source>Template Editor</source>
diff --git a/i18n/lv/wellenreiter.ts b/i18n/lv/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/lv/wellenreiter.ts
+++ b/i18n/lv/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/lv/zlines.ts b/i18n/lv/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/lv/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/lv/zsafe.ts b/i18n/lv/zsafe.ts
index a70c029..519ba04 100644
--- a/i18n/lv/zsafe.ts
+++ b/i18n/lv/zsafe.ts
@@ -220,7 +220,7 @@ rāda sarakstu ar direktorijiem un failiem</translation>
 .../Documents/application
 
 ZSafe will now exit.</source>
-        <translation>Nevaru izveidot direktoriju
+        <translation type="obsolete">Nevaru izveidot direktoriju
 ../Documents/Application
 
 ZSeifs beidz darbu.</translation>
@@ -230,7 +230,7 @@ ZSeifs beidz darbu.</translation>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Nevaru izveidot direktoriju
+        <translation type="obsolete">Nevaru izveidot direktoriju
 %1
 
 ZSeifs beidz darbu.</translation>
@@ -240,7 +240,7 @@ ZSeifs beidz darbu.</translation>
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
-        <translation>Nevaru izveidot direktoriju
+        <translation type="obsolete">Nevaru izveidot direktoriju
 ../Documents/Application/zsafe
 
 ZSeifs beidz darbu.</translation>
@@ -387,7 +387,7 @@ ZSeifs beidz darbu.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Labot Ierakstu</translation>
+        <translation type="obsolete">Labot Ierakstu</translation>
     </message>
     <message>
         <source>Username</source>
@@ -399,7 +399,7 @@ ZSeifs beidz darbu.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Jauns Ieraksts</translation>
+        <translation type="obsolete">Jauns Ieraksts</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -565,7 +565,7 @@ paroli</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Veidoju jaunu ZSefa dokumentu</translation>
+        <translation type="obsolete">Veidoju jaunu ZSefa dokumentu</translation>
     </message>
     <message>
         <source>Now you have to enter
@@ -581,27 +581,63 @@ paroli divas reizes.</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Saglabāt ZSeifa dokumentu kā..</translation>
+        <translation type="obsolete">Saglabāt ZSeifa dokumentu kā..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Paroļu Menedžeris&lt;br&gt;</translation>
+        <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>Zseifs versija 2.1.2-jv01b&lt;br&gt;</translation>
+        <translation type="obsolete">Zseifs versija 2.1.2-jv01b&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>autors Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">autors Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Tulkojis: Gints Polis&lt;br&gt;</translation>
+        <translation type="obsolete">Tulkojis: Gints Polis&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation>ZSafe versija 2.1.2&lt;br&gt;</translation>
+        <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/lv/zsame.ts b/i18n/lv/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/lv/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/advancedfm.ts b/i18n/mk/advancedfm.ts
index cc66814..f15c742 100644
--- a/i18n/mk/advancedfm.ts
+++ b/i18n/mk/advancedfm.ts
@@ -7,14 +7,14 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Директориумот не постои</translation>
+        <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>Менаџер на Датотеки 
+        <translation type="obsolete">Менаџер на Датотеки 
 copyright 2002-2003 од 
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
  и лиценциран под GPL лиценца</translation>
@@ -103,7 +103,7 @@ L.J.Potter&lt;llornkcor@handhelds.org&gt;
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Неможе да се пренесе 
+        <translation type="obsolete">Неможе да се пренесе 
 тековниот директориум од листата на линкови
 Директорумот не е во листата на линкови!</translation>
     </message>
@@ -163,7 +163,7 @@ It is not bookmarked!</source>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Да избришам
+        <translation type="obsolete">Да избришам
 %1 датотеки?</translation>
     </message>
     <message>
@@ -181,19 +181,19 @@ It is not bookmarked!</source>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Избриши %1
+        <translation type="obsolete">Избриши %1
 и неговата содржина?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Избриши 
+        <translation type="obsolete">Избриши 
 %1?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Копирај 
+        <translation type="obsolete">Копирај 
 %1 датотеки?</translation>
     </message>
     <message>
@@ -202,28 +202,28 @@ and all it&apos;s contents ?</source>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 посоти. Да ја препишам?</translation>
+        <translation type="obsolete">%1 посоти. Да ја препишам?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Неможе да се копира %1 во %2</translation>
+        <translation type="obsolete">Неможе да се копира %1 во %2</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 посоти. Да ја препишам?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>Неможе да се копиа
+        <translation type="obsolete">Неможе да се копиа
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>во</translation>
+        <translation type="obsolete">во</translation>
     </message>
     <message>
         <source>Copy </source>
@@ -236,12 +236,12 @@ exists. Ok to overwrite?</source>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>веќе постои.Да ја избришам?</translation>
+        <translation type="obsolete">веќе постои.Да ја избришам?</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Не може да се премести</translation>
+        <translation type="obsolete">Не може да се премести</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
@@ -288,10 +288,67 @@ Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
+        <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>
diff --git a/i18n/mk/backup.ts b/i18n/mk/backup.ts
index 3057bb8..6ed45a8 100644
--- a/i18n/mk/backup.ts
+++ b/i18n/mk/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Бекап и Обновување...работи...</translation>
+        <translation type="obsolete">Бекап и Обновување...работи...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -54,6 +54,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -71,7 +79,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Сними во</translation>
+        <translation type="obsolete">Сними во</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -113,6 +121,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/mk/bartender.ts b/i18n/mk/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/mk/bartender.ts
+++ b/i18n/mk/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/mk/bluetooth-manager.ts b/i18n/mk/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/mk/bluetooth-manager.ts
+++ b/i18n/mk/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/mk/dagger.ts b/i18n/mk/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/mk/dagger.ts
+++ b/i18n/mk/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/mk/launchersettings.ts b/i18n/mk/launchersettings.ts
index 98a0e01..1a70175 100644
--- a/i18n/mk/launchersettings.ts
+++ b/i18n/mk/launchersettings.ts
@@ -176,6 +176,14 @@
         <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>
diff --git a/i18n/mk/libGPRS.ts b/i18n/mk/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/mk/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libaboutapplet.ts b/i18n/mk/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/mk/libaboutapplet.ts
+++ b/i18n/mk/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index f6c7c2f..699b5b9 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Проценти на остнато напојување</translation>
+        <translation type="obsolete">Проценти на остнато напојување</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -67,15 +67,15 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Останато време</translation>
+        <translation type="obsolete">Останато време</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Проценти на остнато напојување:</translation>
+        <translation type="obsolete">Проценти на остнато напојување:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Останато време:</translation>
+        <translation type="obsolete">Останато време:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -86,11 +86,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/mk/libbluetooth.ts b/i18n/mk/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/mk/libbluetooth.ts
+++ b/i18n/mk/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/libbrightnessapplet.ts b/i18n/mk/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libcable.ts b/i18n/mk/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/mk/libcable.ts
+++ b/i18n/mk/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/libcardmonapplet.ts b/i18n/mk/libcardmonapplet.ts
index 81f491d..62f10de 100644
--- a/i18n/mk/libcardmonapplet.ts
+++ b/i18n/mk/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation>Исфрлена:</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libexample_applet.ts b/i18n/mk/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/mk/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libexample_board.ts b/i18n/mk/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/mk/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libexample_vpn.ts b/i18n/mk/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/mk/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libinterfaces.ts b/i18n/mk/libinterfaces.ts
index 3e43c25..9d04b39 100644
--- a/i18n/mk/libinterfaces.ts
+++ b/i18n/mk/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Рестартирање на интерфејс</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/mk/libkppp.ts b/i18n/mk/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/mk/libkppp.ts
+++ b/i18n/mk/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/mk/liblancard.ts b/i18n/mk/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/mk/liblancard.ts
+++ b/i18n/mk/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/liblockapplet.ts b/i18n/mk/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/mk/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libmailwrapper.ts b/i18n/mk/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/mk/libmailwrapper.ts
+++ b/i18n/mk/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/mk/libmemoryapplet.ts b/i18n/mk/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/mk/libmemoryapplet.ts
+++ b/i18n/mk/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/mk/libnetworksettings2.ts b/i18n/mk/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/mk/libnetworksettings2.ts
+++ b/i18n/mk/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/libopiemm2.ts b/i18n/mk/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/mk/libopiemm2.ts
+++ b/i18n/mk/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/libopiepim2.ts b/i18n/mk/libopiepim2.ts
index 27ff458..496d604 100644
--- a/i18n/mk/libopiepim2.ts
+++ b/i18n/mk/libopiepim2.ts
@@ -561,6 +561,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1004,6 +1107,34 @@ and </source>
         <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>
diff --git a/i18n/mk/libopiesecurity2.ts b/i18n/mk/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/mk/libopiesecurity2.ts
+++ b/i18n/mk/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/libopietooth2.ts b/i18n/mk/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/mk/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libopietooth2applet.ts b/i18n/mk/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/mk/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libopieui2.ts b/i18n/mk/libopieui2.ts
index 9bb42d0..23f5c13 100644
--- a/i18n/mk/libopieui2.ts
+++ b/i18n/mk/libopieui2.ts
@@ -80,19 +80,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">Диалог на датотеки</translation>
+        <translation type="obsolete">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Отвори</translation>
+        <translation type="obsolete">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Сними</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Сними</translation>
     </message>
 </context>
 <context>
@@ -140,15 +136,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Стил</translation>
+        <translation type="obsolete">Стил</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Големина</translation>
+        <translation type="obsolete">Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="unfinished">Кафеавата лисица рипа преку мрзливото куче</translation>
+        <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
@@ -413,15 +409,19 @@ and </source>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">Диалог на датотеки</translation>
+        <translation type="unfinished">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Отвори</translation>
+        <translation type="unfinished">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Сними</translation>
+        <translation type="unfinished">Сними</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -435,15 +435,15 @@ and </source>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Стил</translation>
+        <translation type="unfinished">Стил</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Големина</translation>
+        <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
+        <translation type="unfinished">Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/mk/libphasestyle.ts b/i18n/mk/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/mk/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libppp.ts b/i18n/mk/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/mk/libppp.ts
+++ b/i18n/mk/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/mk/libprofile.ts b/i18n/mk/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/mk/libprofile.ts
+++ b/i18n/mk/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/mk/libqpickboard.ts b/i18n/mk/libqpickboard.ts
index 2cc9f99..2c92dad 100644
--- a/i18n/mk/libqpickboard.ts
+++ b/i18n/mk/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Избирачка тастатура</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/libscreenshotapplet.ts b/i18n/mk/libscreenshotapplet.ts
index b135d74..6c0e95b 100644
--- a/i18n/mk/libscreenshotapplet.ts
+++ b/i18n/mk/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation>Поврзувањето со %1 неуспеа.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libtodayaddressbookplugin.ts b/i18n/mk/libtodayaddressbookplugin.ts
index 482e046..79965f2 100644
--- a/i18n/mk/libtodayaddressbookplugin.ts
+++ b/i18n/mk/libtodayaddressbookplugin.ts
@@ -11,11 +11,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Скрати линија по Х карактери:</translation>
+        <translation type="obsolete">Скрати линија по Х карактери:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>После колку карактери информацијата за настанот би требало да биде скратена</translation>
+        <translation type="obsolete">После колку карактери информацијата за настанот би требало да биде скратена</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="unfinished">За да се активираат промените: Рестартирај ја апликацијата!</translation>
+        <translation type="obsolete">За да се активираат промените: Рестартирај ја апликацијата!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
diff --git a/i18n/mk/libtodayexampleplugin.ts b/i18n/mk/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/mk/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodayweatherplugin.ts b/i18n/mk/libtodayweatherplugin.ts
index 0840f64..e5d4455 100644
--- a/i18n/mk/libtodayweatherplugin.ts
+++ b/i18n/mk/libtodayweatherplugin.ts
@@ -107,11 +107,15 @@ Pres: </source>
     </message>
     <message>
         <source> hPa</source>
-        <translation>хПа</translation>
+        <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/libvolumeapplet2.ts b/i18n/mk/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libvpn.ts b/i18n/mk/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/mk/libvpn.ts
+++ b/i18n/mk/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/libwebstyle.ts b/i18n/mk/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/mk/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libwlan.ts b/i18n/mk/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/mk/libwlan.ts
+++ b/i18n/mk/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/mk/main-tab.ts b/i18n/mk/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/mk/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/multiauth.ts b/i18n/mk/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/networksettings2.ts b/i18n/mk/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/mk/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opie-console.ts b/i18n/mk/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/mk/opie-console.ts
+++ b/i18n/mk/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/mk/opie-eye.ts b/i18n/mk/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/mk/opie-eye.ts
+++ b/i18n/mk/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/opie-eye_slave.ts b/i18n/mk/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/mk/opie-eye_slave.ts
+++ b/i18n/mk/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/opie-login.ts b/i18n/mk/opie-login.ts
index fc7fcc6..93d5d9a 100644
--- a/i18n/mk/opie-login.ts
+++ b/i18n/mk/opie-login.ts
@@ -9,7 +9,7 @@ accurately to calibrate your screen.</source>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Добредојдовте во Opie</translation>
+        <translation type="obsolete">Добредојдовте во Opie</translation>
     </message>
 </context>
 <context>
@@ -93,8 +93,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/mk/opie-sheet.ts b/i18n/mk/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/mk/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opie-update-symlinks.ts b/i18n/mk/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/opieirc.ts b/i18n/mk/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/mk/opieirc.ts
+++ b/i18n/mk/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/mk/opiemail.ts b/i18n/mk/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/mk/opiemail.ts
+++ b/i18n/mk/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/mk/opieplayer2.ts b/i18n/mk/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/mk/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/mk/opierec.ts b/i18n/mk/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/mk/opierec.ts
+++ b/i18n/mk/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/opimconverter.ts b/i18n/mk/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/mk/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/osearch.ts b/i18n/mk/osearch.ts
index 7299dca..92ab2d2 100644
--- a/i18n/mk/osearch.ts
+++ b/i18n/mk/osearch.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Внимавај на големи и мали букви</translation>
+        <translation type="obsolete">Внимавај на големи и мали букви</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -85,6 +85,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -97,15 +101,15 @@
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
-        <translation>прикажи завршени задачи</translation>
+        <translation type="obsolete">прикажи завршени задачи</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>прикажи изминати настани</translation>
+        <translation type="obsolete">прикажи изминати настани</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>барај во датуми</translation>
+        <translation type="obsolete">барај во датуми</translation>
     </message>
     <message>
         <source>show</source>
@@ -141,11 +145,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>пребарај содржина</translation>
+        <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 3ac9566..064d8da 100644
--- a/i18n/mk/oxygen.ts
+++ b/i18n/mk/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>Елементарни состојки (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/mk/oyatzee.ts b/i18n/mk/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/mk/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/packagemanager.ts b/i18n/mk/packagemanager.ts
index 04accf9..a9211b1 100644
--- a/i18n/mk/packagemanager.ts
+++ b/i18n/mk/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -271,9 +311,6 @@
     </message>
 </context>
 <context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
@@ -293,7 +330,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Кликни овде за да се освежи листата од серверите.</translation>
+        <translation type="obsolete">Кликни овде за да се освежи листата од серверите.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -301,7 +338,7 @@
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
+        <translation type="obsolete">Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -309,7 +346,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Кликни овде за да се превземат избраните пакети.</translation>
+        <translation type="obsolete">Кликни овде за да се превземат избраните пакети.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -317,7 +354,7 @@
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation>Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
+        <translation type="obsolete">Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
     </message>
     <message>
         <source>Configure</source>
@@ -325,7 +362,7 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Кликни овде за да ја конфигурираш апликацијава.</translation>
+        <translation type="obsolete">Кликни овде за да ја конфигурираш апликацијава.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -337,7 +374,7 @@
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
+        <translation type="obsolete">Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -345,7 +382,7 @@
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>Кликни овде за да се прикажат инсталираните пакети.</translation>
+        <translation type="obsolete">Кликни овде за да се прикажат инсталираните пакети.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -353,7 +390,7 @@
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation>Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
+        <translation type="obsolete">Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
     </message>
     <message>
         <source>Filter by category</source>
@@ -377,7 +414,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Кликни овде за пребарување на текст во имињата на пакетите.</translation>
+        <translation type="obsolete">Кликни овде за пребарување на текст во имињата на пакетите.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -385,7 +422,7 @@
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation>Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
+        <translation type="obsolete">Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -401,7 +438,7 @@
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Кликни овде за да се сокрие палетата за пребарување.</translation>
+        <translation type="obsolete">Кликни овде за да се сокрие палетата за пребарување.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -558,84 +595,140 @@ Oie/Qtopia е вклучена
         <translation type="obsolete">Надградба на стартувач...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -671,23 +764,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Сервер</translation>
+        <translation type="obsolete">Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Име:</translation>
+        <translation type="obsolete">Име:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Адреса:</translation>
+        <translation type="obsolete">Адреса:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Активен Сервер</translation>
+        <translation type="obsolete">Активен Сервер</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Надгради</translation>
+        <translation type="obsolete">Надгради</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -745,6 +838,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Детален излез</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Име:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Локација:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Име:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Адреса:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -777,6 +1012,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
@@ -822,9 +1069,6 @@ Click inside the box at the left to select a package.</source>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
diff --git a/i18n/mk/powerchord.ts b/i18n/mk/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/mk/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/mk/pyquicklauncher.ts b/i18n/mk/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index 03a9c0c..74b95ad 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -387,6 +387,13 @@ Please charge the back-up battery.</source>
     </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>
@@ -406,6 +413,13 @@ Please charge the back-up battery.</source>
     </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>
diff --git a/i18n/mk/security.ts b/i18n/mk/security.ts
index 5c1d0e5..320caaa 100644
--- a/i18n/mk/security.ts
+++ b/i18n/mk/security.ts
@@ -70,40 +70,32 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24 </translation>
+        <translation type="obsolete">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/24 </translation>
+        <translation type="obsolete">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -113,6 +105,26 @@ You can only select an actually configured user.</source>
         <source>None</source>
         <translation type="unfinished">Ништо</translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -137,23 +149,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/sfcave-sdl.ts b/i18n/mk/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/sfcave.ts b/i18n/mk/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/mk/sfcave.ts
+++ b/i18n/mk/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/simple-icon.ts b/i18n/mk/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/mk/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/simple-main.ts b/i18n/mk/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/mk/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/simple-pim.ts b/i18n/mk/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/mk/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/simple.ts b/i18n/mk/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/mk/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/stocktickertest.ts b/i18n/mk/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/mk/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/sysinfo.ts b/i18n/mk/sysinfo.ts
index 1c10578..957a780 100644
--- a/i18n/mk/sysinfo.ts
+++ b/i18n/mk/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -344,6 +340,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -387,5 +387,9 @@ to this process?</source>
         <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 2e59f14..2f6b123 100644
--- a/i18n/mk/tableviewer.ts
+++ b/i18n/mk/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>Листа на клучеви::ДодајКлуч() Немпже да се внесе основна вредност за тип %1. Клучот не е додаден.</translation>
+        <translation type="obsolete">Листа на клучеви::ДодајКлуч() Немпже да се внесе основна вредност за тип %1. Клучот не е додаден.</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation>ПодатокЕлемент::ПоставиПоле(%1 %2) Не е пронајден валиден тип</translation>
+        <translation type="obsolete">ПодатокЕлемент::ПоставиПоле(%1 %2) Не е пронајден валиден тип</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/mk/textedit.ts b/i18n/mk/textedit.ts
index 011e5a1..cd9ae1f 100644
--- a/i18n/mk/textedit.ts
+++ b/i18n/mk/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
 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>
diff --git a/i18n/mk/today.ts b/i18n/mk/today.ts
index 7e64257..70d750c 100644
--- a/i18n/mk/today.ts
+++ b/i18n/mk/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Денес</translation>
+        <translation type="unfinished">Денес</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -19,12 +19,20 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Нема додатоци</translation>
+        <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>
diff --git a/i18n/mk/todolist.ts b/i18n/mk/todolist.ts
index b2fa184..3ac8538 100644
--- a/i18n/mk/todolist.ts
+++ b/i18n/mk/todolist.ts
@@ -13,6 +13,29 @@
         <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>
@@ -38,6 +61,17 @@
     </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>
@@ -55,48 +89,44 @@
         <source>loud</source>
         <translation>Гласен</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Нова од поставка</translation>
+        <translation type="obsolete">Нова од поставка</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Нова задала</translation>
+        <translation type="obsolete">Нова задала</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Кликни овде за да се зададе нова задача.</translation>
+        <translation type="obsolete">Кликни овде за да се зададе нова задача.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Уреди Задача</translation>
+        <translation type="obsolete">Уреди Задача</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Кликни овде за да се измени задачата.</translation>
+        <translation type="obsolete">Кликни овде за да се измени задачата.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Види Задача</translation>
+        <translation type="obsolete">Види Задача</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Избриши...</translation>
+        <translation type="obsolete">Избриши...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Кликни овде за да ја отстраниш моменталната задача.</translation>
+        <translation type="obsolete">Кликни овде за да ја отстраниш моменталната задача.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Избриш се...</translation>
+        <translation type="obsolete">Избриш се...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -104,19 +134,19 @@
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Дуплирај</translation>
+        <translation type="obsolete">Дуплирај</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Пренеси</translation>
+        <translation type="obsolete">Пренеси</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Кликни овде за да ја пренесеш оваа задача на нов уред.</translation>
+        <translation type="obsolete">Кликни овде за да ја пренесеш оваа задача на нов уред.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Најди</translation>
+        <translation type="obsolete">Најди</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -136,15 +166,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Податоци</translation>
+        <translation type="obsolete">Податоци</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Категорија</translation>
+        <translation type="obsolete">Категорија</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Опции</translation>
+        <translation type="obsolete">Опции</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -168,11 +198,11 @@ The list displays the following information:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Сите категории</translation>
+        <translation type="obsolete">Сите категории</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Незапишано</translation>
+        <translation type="obsolete">Незапишано</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -234,7 +264,7 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Подеси поставки</translation>
+        <translation type="obsolete">Подеси поставки</translation>
     </message>
     <message>
         <source>Template Editor</source>
diff --git a/i18n/mk/wellenreiter.ts b/i18n/mk/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/mk/wellenreiter.ts
+++ b/i18n/mk/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/mk/zlines.ts b/i18n/mk/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/mk/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/zsafe.ts b/i18n/mk/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/mk/zsafe.ts
+++ b/i18n/mk/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/zsame.ts b/i18n/mk/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/mk/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/advancedfm.ts b/i18n/nl/advancedfm.ts
index 992d399..53d0eeb 100644
--- a/i18n/nl/advancedfm.ts
+++ b/i18n/nl/advancedfm.ts
@@ -7,14 +7,14 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Deze map bestaat niet</translation>
+        <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>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 copyright 2002-2003
 L.J.Potter &lt;llorncor@handhelds.org&gt;
 en valt onder de GPL</translation>
@@ -142,7 +142,7 @@ en valt onder de GPL</translation>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>%1 bestanden
+        <translation type="obsolete">%1 bestanden
 echt verwijderen?</translation>
     </message>
     <message>
@@ -160,7 +160,7 @@ echt verwijderen?</translation>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>%1 bestanden
+        <translation type="obsolete">%1 bestanden
 echt kopiëren?</translation>
     </message>
     <message>
@@ -169,27 +169,27 @@ echt kopiëren?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 Bestaat al, Overschrijven?</translation>
+        <translation type="obsolete">%1 Bestaat al, Overschrijven?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Kon %1 niet naar %2 kopiëren</translation>
+        <translation type="obsolete">Kon %1 niet naar %2 kopiëren</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>bestaat. Overschrijven?</translation>
+        <translation type="obsolete">bestaat. Overschrijven?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>Kan niet kopiëren
+        <translation type="obsolete">Kan niet kopiëren
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>naar</translation>
+        <translation type="obsolete">naar</translation>
     </message>
     <message>
         <source>Copy </source>
@@ -202,13 +202,13 @@ exists. Ok to overwrite?</source>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>bestaat al.
+        <translation type="obsolete">bestaat al.
 Wilt u het echt verwijderen?</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Kan niet verplaatsen
+        <translation type="obsolete">Kan niet verplaatsen
 </translation>
     </message>
     <message>
@@ -247,7 +247,7 @@ Wilt u het echt verwijderen?</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Kan huidige map niet verwijderen
+        <translation type="obsolete">Kan huidige map niet verwijderen
 van favorietenlijst.
 Er is geen favoriet van!</translation>
     </message>
@@ -258,13 +258,13 @@ Er is geen favoriet van!</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>%1 en alle inhoud
+        <translation type="obsolete">%1 en alle inhoud
 echt verwijderen?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>%1
+        <translation type="obsolete">%1
 echt verwijderen?</translation>
     </message>
     <message>
@@ -284,10 +284,74 @@ echt verwijderen?</translation>
 %1 
 to 
 %2</source>
-        <translation>Kon niet van
+        <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>
diff --git a/i18n/nl/backup.ts b/i18n/nl/backup.ts
index 2728277..665bcc7 100644
--- a/i18n/nl/backup.ts
+++ b/i18n/nl/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Backup en herstel, voortgang....</translation>
+        <translation type="obsolete">Backup en herstel, voortgang....</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -63,6 +63,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -80,7 +88,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Opslaan in</translation>
+        <translation type="obsolete">Opslaan in</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -126,6 +134,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/nl/bartender.ts b/i18n/nl/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/nl/bartender.ts
+++ b/i18n/nl/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/nl/bluetooth-manager.ts b/i18n/nl/bluetooth-manager.ts
index 7b1aa15..03c4e33 100644
--- a/i18n/nl/bluetooth-manager.ts
+++ b/i18n/nl/bluetooth-manager.ts
@@ -90,7 +90,7 @@
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
-        <translation>Bluetooth Basisinstelling</translation>
+        <translation type="obsolete">Bluetooth Basisinstelling</translation>
     </message>
     <message>
         <source>Default Passkey</source>
@@ -128,6 +128,10 @@
         <source>Status Label</source>
         <translation>Status Label</translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/nl/dagger.ts b/i18n/nl/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/nl/dagger.ts
+++ b/i18n/nl/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/nl/launchersettings.ts b/i18n/nl/launchersettings.ts
index 98265a3..f212855 100644
--- a/i18n/nl/launchersettings.ts
+++ b/i18n/nl/launchersettings.ts
@@ -195,6 +195,14 @@
         <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>
diff --git a/i18n/nl/libGPRS.ts b/i18n/nl/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/nl/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libaboutapplet.ts b/i18n/nl/libaboutapplet.ts
index 1e62628..289cb06 100644
--- a/i18n/nl/libaboutapplet.ts
+++ b/i18n/nl/libaboutapplet.ts
@@ -14,7 +14,7 @@
     <name>AboutDialog</name>
     <message>
         <source>About</source>
-        <translation>Over...</translation>
+        <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>
@@ -42,7 +42,7 @@ Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhel
     </message>
     <message>
         <source>Authors</source>
-        <translation>Schrijvers</translation>
+        <translation type="obsolete">Schrijvers</translation>
     </message>
     <message>
         <source>&lt;p&gt;
@@ -68,7 +68,7 @@ Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhel
     </message>
     <message>
         <source>Report</source>
-        <translation>Rapporteer</translation>
+        <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;
@@ -80,7 +80,7 @@ Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhel
     </message>
     <message>
         <source>Join</source>
-        <translation>Meedoen</translation>
+        <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;
@@ -95,6 +95,21 @@ Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhel
         <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="unfinished">&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;
@@ -107,20 +122,8 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="unfinished">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</translation>
+        <source>Authors</source>
+        <translation type="unfinished">Schrijvers</translation>
     </message>
     <message>
         <source>&lt;p&gt;
@@ -136,5 +139,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></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>
 </context>
 </TS>
diff --git a/i18n/nl/libbatteryapplet.ts b/i18n/nl/libbatteryapplet.ts
index a2cd8ee..3b5b9ba 100644
--- a/i18n/nl/libbatteryapplet.ts
+++ b/i18n/nl/libbatteryapplet.ts
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Beschikbare batterijlading</translation>
+        <translation type="obsolete">Beschikbare batterijlading</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -67,15 +67,15 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Overblijvende batterijtijd</translation>
+        <translation type="obsolete">Overblijvende batterijtijd</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Percentage batterij resterend:</translation>
+        <translation type="obsolete">Percentage batterij resterend:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Overblijvende batterijtijd:</translation>
+        <translation type="obsolete">Overblijvende batterijtijd:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -87,11 +87,28 @@
     </message>
     <message>
         <source>Ipaq  </source>
-        <translation>Ipaq</translation>
+        <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/libbluetooth.ts b/i18n/nl/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/nl/libbluetooth.ts
+++ b/i18n/nl/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/libbrightnessapplet.ts b/i18n/nl/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libcable.ts b/i18n/nl/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/nl/libcable.ts
+++ b/i18n/nl/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/nl/libcardmonapplet.ts b/i18n/nl/libcardmonapplet.ts
index 3310ef4..b1a77fb 100644
--- a/i18n/nl/libcardmonapplet.ts
+++ b/i18n/nl/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation>Afgesloten:</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/libexample_applet.ts b/i18n/nl/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/nl/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libexample_board.ts b/i18n/nl/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/nl/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libexample_vpn.ts b/i18n/nl/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/nl/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libinterfaces.ts b/i18n/nl/libinterfaces.ts
index 71292e8..9082976 100644
--- a/i18n/nl/libinterfaces.ts
+++ b/i18n/nl/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Herstarten interface</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/nl/libkppp.ts b/i18n/nl/libkppp.ts
index a9a9504..ee26e87 100644
--- a/i18n/nl/libkppp.ts
+++ b/i18n/nl/libkppp.ts
@@ -456,6 +456,10 @@ apparaat
         <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>
diff --git a/i18n/nl/liblancard.ts b/i18n/nl/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/nl/liblancard.ts
+++ b/i18n/nl/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/liblockapplet.ts b/i18n/nl/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/nl/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libmailwrapper.ts b/i18n/nl/libmailwrapper.ts
index bca5b10..0cf9f6f 100644
--- a/i18n/nl/libmailwrapper.ts
+++ b/i18n/nl/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation>Fout bij verwijderen mail %1</translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/nl/libmemoryapplet.ts b/i18n/nl/libmemoryapplet.ts
index f581c18..3a9963d 100644
--- a/i18n/nl/libmemoryapplet.ts
+++ b/i18n/nl/libmemoryapplet.ts
@@ -124,7 +124,7 @@ Gegeugen wordt geklassificeerd als volgt:
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation>2 Mb, 4 Mb, 6 Mb, 8 Mb</translation>
+        <translation type="obsolete">2 Mb, 4 Mb, 6 Mb, 8 Mb</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
@@ -162,5 +162,9 @@ Gegeugen wordt geklassificeerd als volgt:
         <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/libnetworksettings2.ts b/i18n/nl/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/nl/libnetworksettings2.ts
+++ b/i18n/nl/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/nl/libopiemm2.ts b/i18n/nl/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/nl/libopiemm2.ts
+++ b/i18n/nl/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/libopiepim2.ts b/i18n/nl/libopiepim2.ts
index 5e5b99d..79b430d 100644
--- a/i18n/nl/libopiepim2.ts
+++ b/i18n/nl/libopiepim2.ts
@@ -597,6 +597,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1036,6 +1139,34 @@ and </source>
         <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>
diff --git a/i18n/nl/libopiesecurity2.ts b/i18n/nl/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/nl/libopiesecurity2.ts
+++ b/i18n/nl/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/nl/libopietooth2.ts b/i18n/nl/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/nl/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libopietooth2applet.ts b/i18n/nl/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/nl/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libopieui2.ts b/i18n/nl/libopieui2.ts
index 5dfd35c..bfeb96f 100644
--- a/i18n/nl/libopieui2.ts
+++ b/i18n/nl/libopieui2.ts
@@ -112,19 +112,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">Bestandsdialoog</translation>
+        <translation type="obsolete">Bestandsdialoog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Open</translation>
+        <translation type="obsolete">Open</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Sla op</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sla op</translation>
     </message>
 </context>
 <context>
@@ -172,15 +168,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Stijl</translation>
+        <translation type="obsolete">Stijl</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Grootte</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
@@ -508,15 +504,19 @@ and </source>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">Bestandsdialoog</translation>
+        <translation type="unfinished">Bestandsdialoog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Open</translation>
+        <translation type="unfinished">Open</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Sla op</translation>
+        <translation type="unfinished">Sla op</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -530,15 +530,15 @@ and </source>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Stijl</translation>
+        <translation type="unfinished">Stijl</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Grootte</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/nl/libphasestyle.ts b/i18n/nl/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/nl/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libppp.ts b/i18n/nl/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/nl/libppp.ts
+++ b/i18n/nl/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/nl/libprofile.ts b/i18n/nl/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/nl/libprofile.ts
+++ b/i18n/nl/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/nl/libqpickboard.ts b/i18n/nl/libqpickboard.ts
index 7eef6c6..eb06783 100644
--- a/i18n/nl/libqpickboard.ts
+++ b/i18n/nl/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/libscreenshotapplet.ts b/i18n/nl/libscreenshotapplet.ts
index 277e851..e1e067c 100644
--- a/i18n/nl/libscreenshotapplet.ts
+++ b/i18n/nl/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation>Verbinding met %1 mislukt.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/libtodayaddressbookplugin.ts b/i18n/nl/libtodayaddressbookplugin.ts
index bcf210a..ebe3507 100644
--- a/i18n/nl/libtodayaddressbookplugin.ts
+++ b/i18n/nl/libtodayaddressbookplugin.ts
@@ -11,11 +11,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Knip lijn na X tekens:</translation>
+        <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>Na hoeveel tekens de info over de taak afgebroken moet worden</translation>
+        <translation type="obsolete">Na hoeveel tekens de info over de taak afgebroken moet worden</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Herstart programma om instellingen te activeren!</translation>
+        <translation type="obsolete">Herstart programma om instellingen te activeren!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
diff --git a/i18n/nl/libtodayexampleplugin.ts b/i18n/nl/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/nl/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtodayweatherplugin.ts b/i18n/nl/libtodayweatherplugin.ts
index bcc6366..c5ccbe0 100644
--- a/i18n/nl/libtodayweatherplugin.ts
+++ b/i18n/nl/libtodayweatherplugin.ts
@@ -107,11 +107,15 @@ Luchtdruk:</translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation>hPa</translation>
+        <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/libvolumeapplet2.ts b/i18n/nl/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libvpn.ts b/i18n/nl/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/nl/libvpn.ts
+++ b/i18n/nl/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/nl/libwebstyle.ts b/i18n/nl/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/nl/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libwlan.ts b/i18n/nl/libwlan.ts
index 42463ce..859e7ec 100644
--- a/i18n/nl/libwlan.ts
+++ b/i18n/nl/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -195,9 +192,14 @@
         <source>Signal</source>
         <translation type="obsolete">Signaal</translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
+    <message>
+        <source>SSID</source>
+        <translation type="obsolete">SSID</translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="obsolete">Kan</translation>
+    </message>
 </context>
 <context>
     <name>WlanInfo</name>
diff --git a/i18n/nl/main-tab.ts b/i18n/nl/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/nl/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/multiauth.ts b/i18n/nl/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/networksettings2.ts b/i18n/nl/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/nl/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/opie-console.ts b/i18n/nl/opie-console.ts
index b85e186..60e252d 100644
--- a/i18n/nl/opie-console.ts
+++ b/i18n/nl/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation>Wijzig sleutel</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation>9600 baud</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 baud</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 baud</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 baud</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -746,7 +792,7 @@
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Bellen van nummer mislukt.</translation>
+        <translation type="obsolete">Bellen van nummer mislukt.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -784,6 +830,14 @@
         <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>
@@ -804,19 +858,19 @@
     </message>
     <message>
         <source>Font size</source>
-        <translation>Lettertypegrootte</translation>
+        <translation type="obsolete">Lettertypegrootte</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>klein</translation>
+        <translation type="obsolete">klein</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>middel</translation>
+        <translation type="obsolete">middel</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>groot</translation>
+        <translation type="obsolete">groot</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/nl/opie-eye.ts b/i18n/nl/opie-eye.ts
index 3456b2b..eb7b899 100644
--- a/i18n/nl/opie-eye.ts
+++ b/i18n/nl/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,12 +91,16 @@
         <source>Image</source>
         <translation>Afbeelding</translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
         <source>Phunk View - Config</source>
-        <translation>Priegel-aanzicht - Instell</translation>
+        <translation type="obsolete">Priegel-aanzicht - Instell</translation>
     </message>
     <message>
         <source>Browser Keyboard Actions</source>
@@ -48,6 +110,102 @@
         <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>
 </context>
 <context>
     <name>QObject</name>
@@ -58,7 +216,7 @@
     </message>
     <message>
         <source>Opie Eye Caramba</source>
-        <translation>Opie Eye Caramba</translation>
+        <translation type="obsolete">Opie Eye Caramba</translation>
     </message>
     <message>
         <source>Show all files</source>
@@ -66,7 +224,77 @@
     </message>
     <message>
         <source>DirView</source>
-        <translation>Mapaanzicht</translation>
+        <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>
+</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 ee7d77a..fe5f14a 100644
--- a/i18n/nl/opie-eye_slave.ts
+++ b/i18n/nl/opie-eye_slave.ts
@@ -157,157 +157,157 @@
     <message>
         <source>Colormode: Color
 </source>
-        <translation>Kleurmodus: Kleur
+        <translation type="obsolete">Kleurmodus: Kleur
 </translation>
     </message>
     <message>
         <source>Colormode: Black and white
 </source>
-        <translation>Kleurmodus: Zwart/Wit
+        <translation type="obsolete">Kleurmodus: Zwart/Wit
 </translation>
     </message>
     <message>
         <source>Basic</source>
-        <translation>Grof</translation>
+        <translation type="obsolete">Grof</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation>Normaal</translation>
+        <translation type="obsolete">Normaal</translation>
     </message>
     <message>
         <source>Fine</source>
-        <translation>Fijn</translation>
+        <translation type="obsolete">Fijn</translation>
     </message>
     <message>
         <source>Quality: %1
 </source>
-        <translation>Kwaliteit: %1
+        <translation type="obsolete">Kwaliteit: %1
 </translation>
     </message>
     <message>
         <source>Daylight</source>
-        <translation>Daglicht</translation>
+        <translation type="obsolete">Daglicht</translation>
     </message>
     <message>
         <source>Fluorescent</source>
-        <translation>Fluorescent</translation>
+        <translation type="obsolete">Fluorescent</translation>
     </message>
     <message>
         <source>Tungsten</source>
-        <translation>Tungsten</translation>
+        <translation type="obsolete">Tungsten</translation>
     </message>
     <message>
         <source>Standard light A</source>
-        <translation>Standaardlicht A</translation>
+        <translation type="obsolete">Standaardlicht A</translation>
     </message>
     <message>
         <source>Standard light B</source>
-        <translation>Standaardlicht B</translation>
+        <translation type="obsolete">Standaardlicht B</translation>
     </message>
     <message>
         <source>Standard light C</source>
-        <translation>Standaardlicht C</translation>
+        <translation type="obsolete">Standaardlicht C</translation>
     </message>
     <message>
         <source>D55</source>
-        <translation>D55</translation>
+        <translation type="obsolete">D55</translation>
     </message>
     <message>
         <source>D65</source>
-        <translation>D65</translation>
+        <translation type="obsolete">D65</translation>
     </message>
     <message>
         <source>D75</source>
-        <translation>D75</translation>
+        <translation type="obsolete">D75</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Anders</translation>
+        <translation type="obsolete">Anders</translation>
     </message>
     <message>
         <source>White Balance: %1
 </source>
-        <translation>Witbalans: %1
+        <translation type="obsolete">Witbalans: %1
 </translation>
     </message>
     <message>
         <source>Average</source>
-        <translation>Gemiddeld</translation>
+        <translation type="obsolete">Gemiddeld</translation>
     </message>
     <message>
         <source>Center weighted average</source>
-        <translation>Centreer gewogen gemiddelde</translation>
+        <translation type="obsolete">Centreer gewogen gemiddelde</translation>
     </message>
     <message>
         <source>Spot</source>
-        <translation>Spot</translation>
+        <translation type="obsolete">Spot</translation>
     </message>
     <message>
         <source>MultiSpot</source>
-        <translation>MultiSpot</translation>
+        <translation type="obsolete">MultiSpot</translation>
     </message>
     <message>
         <source>Pattern</source>
-        <translation>Patroon</translation>
+        <translation type="obsolete">Patroon</translation>
     </message>
     <message>
         <source>Partial</source>
-        <translation>Gedeeltelijk</translation>
+        <translation type="obsolete">Gedeeltelijk</translation>
     </message>
     <message>
         <source>Metering Mode: %1
 </source>
-        <translation>Meetmodus: %1
+        <translation type="obsolete">Meetmodus: %1
 </translation>
     </message>
     <message>
         <source>Not defined</source>
-        <translation>Niet opgegeven</translation>
+        <translation type="obsolete">Niet opgegeven</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation>Handmatig</translation>
+        <translation type="obsolete">Handmatig</translation>
     </message>
     <message>
         <source>Normal progam</source>
-        <translation>Normaal programma</translation>
+        <translation type="obsolete">Normaal programma</translation>
     </message>
     <message>
         <source>Aperture priority</source>
-        <translation>Aperture prioriteit</translation>
+        <translation type="obsolete">Aperture prioriteit</translation>
     </message>
     <message>
         <source>Shutter priority</source>
-        <translation>Sluiterprioriteit</translation>
+        <translation type="obsolete">Sluiterprioriteit</translation>
     </message>
     <message>
         <source>Creative progam
 (biased toward fast shutter speed</source>
-        <translation>Kreatief programma
+        <translation type="obsolete">Kreatief programma
 (ingesteld op snelle sluitertijd)</translation>
     </message>
     <message>
         <source>Action progam
 (biased toward fast shutter speed)</source>
-        <translation>Aktief programma
+        <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>Portretmodus
+        <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>Landschap modus
+        <translation type="obsolete">Landschap modus
 (voor landschapfoto&apos;s met scherpe achtergrond)</translation>
     </message>
     <message>
         <source>Exposure Program: %1
 </source>
-        <translation>Belichtings programma: %1
+        <translation type="obsolete">Belichtings programma: %1
 </translation>
     </message>
     <message>
@@ -395,5 +395,29 @@
         <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 f47d7b2..37a8ecd 100644
--- a/i18n/nl/opie-login.ts
+++ b/i18n/nl/opie-login.ts
@@ -8,7 +8,7 @@ accurately to calibrate your screen.</source>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Welkom bij Opie</translation>
+        <translation type="obsolete">Welkom bij Opie</translation>
     </message>
 </context>
 <context>
@@ -95,7 +95,54 @@ signaal (%1)
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
-        <translation>&lt;center&gt;Welkom bij OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
+        <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/opie-sheet.ts b/i18n/nl/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/nl/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/opie-update-symlinks.ts b/i18n/nl/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/opieirc.ts b/i18n/nl/opieirc.ts
index 23903da..5f3df2a 100644
--- a/i18n/nl/opieirc.ts
+++ b/i18n/nl/opieirc.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
@@ -58,6 +58,21 @@
     </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>
@@ -125,7 +140,7 @@
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Bijnaamverandering van een onbekend persoon</translation>
+        <translation type="obsolete">Bijnaamverandering van een onbekend persoon</translation>
     </message>
     <message>
         <source> has quit </source>
@@ -149,7 +164,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>CTCP VERSION ontvangen van</translation>
+        <translation type="obsolete">CTCP VERSION ontvangen van</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -249,16 +264,113 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>U staat nu bekend als %1</translation>
+        <translation type="obsolete">U staat nu bekend als %1</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 staat nu bekend als %2</translation>
+        <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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -355,7 +467,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>Poort vereist</translation>
+        <translation type="obsolete">Poort vereist</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -363,7 +475,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>Echte naam vereist</translation>
+        <translation type="obsolete">Echte naam vereist</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -417,7 +529,7 @@ bevatten die beginnen met &apos;#&apos; of &apos;+&apos;</translation>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Verbinding met</translation>
+        <translation type="obsolete">Verbinding met</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -427,6 +539,25 @@ bevatten die beginnen met &apos;#&apos; of &apos;+&apos;</translation>
         <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>
@@ -506,6 +637,14 @@ bevatten die beginnen met &apos;#&apos; of &apos;+&apos;</translation>
         <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>
@@ -553,4 +692,31 @@ bevatten die beginnen met &apos;#&apos; of &apos;+&apos;</translation>
         <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 6a40553..3707070 100644
--- a/i18n/nl/opiemail.ts
+++ b/i18n/nl/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -364,17 +364,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -533,6 +533,18 @@ with that filter will be listet.</source>
         <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>
@@ -724,12 +736,16 @@ with that filter will be listet.</source>
         <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>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
-        <translation>E-mail met %1</translation>
+        <translation type="obsolete">E-mail met %1</translation>
     </message>
     <message>
         <source>Mail</source>
@@ -767,6 +783,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/nl/opieplayer2.ts b/i18n/nl/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/nl/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/nl/opierec.ts b/i18n/nl/opierec.ts
index dcf4ba1..8bc8065 100644
--- a/i18n/nl/opierec.ts
+++ b/i18n/nl/opierec.ts
@@ -114,7 +114,7 @@ kaart wordt niet herkend</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>seconden</translation>
+        <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;
@@ -181,15 +181,15 @@ echt &lt;font size=+2&gt;&lt;B&gt;VERWIJDEREN&lt;/B&gt;&lt;/font&gt;?</translati
     </message>
     <message>
         <source>Rec</source>
-        <translation>Opname</translation>
+        <translation type="obsolete">Opname</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>Plaats</translation>
+        <translation type="obsolete">Plaats</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Datum</translation>
+        <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
@@ -205,7 +205,7 @@ echt &lt;font size=+2&gt;&lt;B&gt;VERWIJDEREN&lt;/B&gt;&lt;/font&gt;?</translati
     </message>
     <message>
         <source>Stop</source>
-        <translation>Stop</translation>
+        <translation type="obsolete">Stop</translation>
     </message>
     <message>
         <source>Auto Mute</source>
@@ -213,7 +213,15 @@ echt &lt;font size=+2&gt;&lt;B&gt;VERWIJDEREN&lt;/B&gt;&lt;/font&gt;?</translati
     </message>
     <message>
         <source>Stereo Channels</source>
-        <translation>Stereokanalen</translation>
+        <translation type="obsolete">Stereokanalen</translation>
+    </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/opimconverter.ts b/i18n/nl/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/nl/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/osearch.ts b/i18n/nl/osearch.ts
index adac82f..6864a13 100644
--- a/i18n/nl/osearch.ts
+++ b/i18n/nl/osearch.ts
@@ -35,7 +35,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Hoofdlettergevoelig</translation>
+        <translation type="obsolete">Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -85,6 +85,10 @@
         <source></source>
         <translation></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -117,15 +121,15 @@
     </message>
     <message>
         <source>show completed tasks</source>
-        <translation>laat afgemaakte taken zien</translation>
+        <translation type="obsolete">laat afgemaakte taken zien</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>laat vroegere gebeurtenissen zien</translation>
+        <translation type="obsolete">laat vroegere gebeurtenissen zien</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>zoek in data</translation>
+        <translation type="obsolete">zoek in data</translation>
     </message>
     <message>
         <source>File: </source>
@@ -141,11 +145,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>zoek inhoud</translation>
+        <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 66d528f..8ad1498 100644
--- a/i18n/nl/oxygen.ts
+++ b/i18n/nl/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>Elementaire compositie (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/nl/oyatzee.ts b/i18n/nl/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/nl/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/packagemanager.ts b/i18n/nl/packagemanager.ts
index 358c4a6..7f694db 100644
--- a/i18n/nl/packagemanager.ts
+++ b/i18n/nl/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation>Geinstalleerd op:</translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -378,7 +418,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Klik hier om de pakketlijsten van de server te vernieuwen.</translation>
+        <translation type="obsolete">Klik hier om de pakketlijsten van de server te vernieuwen.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -386,7 +426,7 @@
     </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>
+        <translation type="obsolete">Klik hier om alle geinstaleerde pakketten te vernieuwen als er een nieuwere versie is.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -394,7 +434,7 @@
     </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>
+        <translation type="obsolete">Klik hier on de momenteel geselecteerde pakketten op te halen.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -402,7 +442,7 @@
     </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>
+        <translation type="obsolete">Klik hier om de momenteel geselecteerde pakketten te installeren, verwijderen of vernieuwen.</translation>
     </message>
     <message>
         <source>Configure</source>
@@ -410,7 +450,7 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Klik hier om dit programma in te stellen.</translation>
+        <translation type="obsolete">Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -422,7 +462,7 @@
     </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>
+        <translation type="obsolete">Klik hier om beschikbare pakketten te laten zien die niet geinstallerd zijn.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -430,7 +470,7 @@
     </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>
+        <translation type="obsolete">Klik hier om de momenteel geinstalleerde paketten te zien.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -438,7 +478,7 @@
     </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>
+        <translation type="obsolete">Klik hier om geinstalleerde pakketten te laten zien waar een nieuwere versie van beschikbaar is.</translation>
     </message>
     <message>
         <source>Filter by category</source>
@@ -462,7 +502,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Klik hier om te zoeken op tekst in pakketnamen.</translation>
+        <translation type="obsolete">Klik hier om te zoeken op tekst in pakketnamen.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -470,7 +510,7 @@
     </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>
+        <translation type="obsolete">Klik hier om het volgende pakket te zoeken die aan de zoektekst voldoet.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -486,7 +526,7 @@
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Klik hier om de zoekbalk te verbergen.</translation>
+        <translation type="obsolete">Klik hier om de zoekbalk te verbergen.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -652,7 +692,7 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation>Dit is een lijst van alle pakketten.
+        <translation type="obsolete">Dit is een lijst van alle pakketten.
 
 Een blauwe stip naast een pakket betekent dat het momenteel is geinstalleerd.
 
@@ -666,7 +706,7 @@ Klik in het selectievak links om een pakket te selecteren.</translation>
     </message>
     <message>
         <source>Click here to apply current filter.</source>
-        <translation>Klik hier om het filter te activeren.</translation>
+        <translation type="obsolete">Klik hier om het filter te activeren.</translation>
     </message>
     <message>
         <source>Filter settings</source>
@@ -674,7 +714,7 @@ Klik in het selectievak links om een pakket te selecteren.</translation>
     </message>
     <message>
         <source>Click here to change the package filter criteria.</source>
-        <translation>Klik hier om de filtercriteria vast te stellen.</translation>
+        <translation type="obsolete">Klik hier om de filtercriteria vast te stellen.</translation>
     </message>
     <message>
         <source>Package Manager</source>
@@ -716,20 +756,106 @@ Klik in het selectievak links om een pakket te selecteren.</translation>
         <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation>De configuratie is vernieuwd, Wilt u nu de server en pakket informatie verversen?</translation>
     </message>
+    <message>
+        <source>This is a listing of all packages.
+
+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.
+
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to update package lists from servers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to download the currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install local package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install a package file located on device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to configure this application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages available which have not been installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to apply current filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to change the package filter criteria.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to search for text in package names.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
-        <translation>Olpkg</translation>
+        <translation type="obsolete">Olpkg</translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
-        <translation>Fout bij instellen libipkg</translation>
+        <translation type="obsolete">Fout bij instellen libipkg</translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
-        <translation>Fout bij vrijgeven libipkg</translation>
+        <translation type="obsolete">Fout bij vrijgeven libipkg</translation>
+    </message>
+    <message>
+        <source>Linking packages installed in: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Links removed for: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -764,23 +890,23 @@ Klik in het selectievak links om een pakket te selecteren.</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation>Server</translation>
+        <translation type="obsolete">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Naam:</translation>
+        <translation type="obsolete">Naam:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation>Adres:</translation>
+        <translation type="obsolete">Adres:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation>Aktieve Server</translation>
+        <translation type="obsolete">Aktieve Server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation>Vernieuw</translation>
+        <translation type="obsolete">Vernieuw</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -838,6 +964,148 @@ Klik in het selectievak links om een pakket te selecteren.</translation>
         <source>Troubleshooting output</source>
         <translation>Foutopsporingsuitvoer</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Naam:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Locatie:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Naam:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Adres:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -872,6 +1140,18 @@ Klik in het selectievak links om een pakket te selecteren.</translation>
         <source>File list</source>
         <translation>Bestandslijst</translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/nl/powerchord.ts b/i18n/nl/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/nl/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/nl/pyquicklauncher.ts b/i18n/nl/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/qpe.ts b/i18n/nl/qpe.ts
index 19fb93f..a725ec1 100644
--- a/i18n/nl/qpe.ts
+++ b/i18n/nl/qpe.ts
@@ -392,6 +392,13 @@ Reservebatterij opladen aub.</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>
@@ -411,6 +418,13 @@ Reservebatterij opladen aub.</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>
diff --git a/i18n/nl/security.ts b/i18n/nl/security.ts
index 36d6365..e884b0d 100644
--- a/i18n/nl/security.ts
+++ b/i18n/nl/security.ts
@@ -76,7 +76,7 @@ Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished">&lt;p&gt;Alle gebruikersinstellingen zullen verloren gaan.</translation>
+        <translation type="obsolete">&lt;p&gt;Alle gebruikersinstellingen zullen verloren gaan.</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -84,31 +84,31 @@ Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -118,6 +118,26 @@ Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
         <source>None</source>
         <translation type="unfinished">Geen</translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -142,23 +162,43 @@ Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <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>
diff --git a/i18n/nl/sfcave-sdl.ts b/i18n/nl/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/sfcave.ts b/i18n/nl/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/nl/sfcave.ts
+++ b/i18n/nl/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/simple-icon.ts b/i18n/nl/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/nl/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/simple-main.ts b/i18n/nl/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/nl/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/simple-pim.ts b/i18n/nl/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/nl/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/simple.ts b/i18n/nl/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/nl/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/stocktickertest.ts b/i18n/nl/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/nl/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/sysinfo.ts b/i18n/nl/sysinfo.ts
index a439020..c4fba82 100644
--- a/i18n/nl/sysinfo.ts
+++ b/i18n/nl/sysinfo.ts
@@ -65,10 +65,6 @@
         <source>error</source>
         <translation>fout</translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -366,6 +362,10 @@ dit proces gestuurd worden?</translation>
         <source>Benchmark</source>
         <translation>Benchmark</translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -409,5 +409,9 @@ dit proces gestuurd worden?</translation>
         <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/tableviewer.ts b/i18n/nl/tableviewer.ts
index 5e8a089..32cbd05 100644
--- a/i18n/nl/tableviewer.ts
+++ b/i18n/nl/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Kan standaardwaarde niet instellen bij type %1, Key niet toegevoegd.</translation>
+        <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>DataElem::setField(%1, %2) Geen juist type gevonden</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) Geen juist type gevonden</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/nl/textedit.ts b/i18n/nl/textedit.ts
index 1011528..6548380 100644
--- a/i18n/nl/textedit.ts
+++ b/i18n/nl/textedit.ts
@@ -209,6 +209,10 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
 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>
diff --git a/i18n/nl/today.ts b/i18n/nl/today.ts
index fa502b6..15d8850 100644
--- a/i18n/nl/today.ts
+++ b/i18n/nl/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Vandaag</translation>
+        <translation type="unfinished">Vandaag</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -19,7 +19,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Geen plugins gevonden</translation>
+        <translation type="obsolete">Geen plugins gevonden</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -29,6 +29,14 @@
         <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>
diff --git a/i18n/nl/todolist.ts b/i18n/nl/todolist.ts
index 1201abe..a9ecb68 100644
--- a/i18n/nl/todolist.ts
+++ b/i18n/nl/todolist.ts
@@ -13,6 +13,29 @@
         <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>
@@ -38,6 +61,17 @@
     </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>
@@ -57,46 +91,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Opie TeDoen lijst</translation>
+        <translation type="obsolete">Opie TeDoen lijst</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Nieuw van voorbeeld</translation>
+        <translation type="obsolete">Nieuw van voorbeeld</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nieuwe taak</translation>
+        <translation type="obsolete">Nieuwe taak</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Klik hier om een nieuwe taak te maken.</translation>
+        <translation type="obsolete">Klik hier om een nieuwe taak te maken.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Wijzig taak</translation>
+        <translation type="obsolete">Wijzig taak</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Klik hier om de huidige taak te wijzigen.</translation>
+        <translation type="obsolete">Klik hier om de huidige taak te wijzigen.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Bekijk taak</translation>
+        <translation type="obsolete">Bekijk taak</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Verwijder...</translation>
+        <translation type="obsolete">Verwijder...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Klik hier om de huidige taak te verwijderen.</translation>
+        <translation type="obsolete">Klik hier om de huidige taak te verwijderen.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Verwijder alle...</translation>
+        <translation type="obsolete">Verwijder alle...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -104,19 +138,19 @@
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Dupliceer</translation>
+        <translation type="obsolete">Dupliceer</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>IrDa Versturen</translation>
+        <translation type="obsolete">IrDa Versturen</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Klik hier om de huidige taak naar een ander apparaat te sturen.</translation>
+        <translation type="obsolete">Klik hier om de huidige taak naar een ander apparaat te sturen.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Vind</translation>
+        <translation type="obsolete">Vind</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -136,15 +170,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opties</translation>
+        <translation type="obsolete">Opties</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -168,11 +202,11 @@ De lijst geeft de volgende info door:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Alle kategorieen</translation>
+        <translation type="obsolete">Alle kategorieen</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Onbenoemd</translation>
+        <translation type="obsolete">Onbenoemd</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -234,7 +268,7 @@ Toch stoppen?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Stel voorbeelden in</translation>
+        <translation type="obsolete">Stel voorbeelden in</translation>
     </message>
     <message>
         <source>Template Editor</source>
diff --git a/i18n/nl/wellenreiter.ts b/i18n/nl/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/nl/wellenreiter.ts
+++ b/i18n/nl/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/nl/zlines.ts b/i18n/nl/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/nl/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/zsafe.ts b/i18n/nl/zsafe.ts
index adb0ea2..9f29023 100644
--- a/i18n/nl/zsafe.ts
+++ b/i18n/nl/zsafe.ts
@@ -432,7 +432,7 @@ laat de lijst van mappen en bestanden zien</translation>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kan de map
+        <translation type="obsolete">Kan de map
 %1
 niet maken.
 
@@ -516,7 +516,7 @@ ZSafe zal nu afsluiten.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -564,7 +564,7 @@ ZSafe zal nu afsluiten.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Invoer wijzigen</translation>
+        <translation type="obsolete">Invoer wijzigen</translation>
     </message>
     <message>
         <source>Username</source>
@@ -576,7 +576,7 @@ ZSafe zal nu afsluiten.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Nieuwe Invoer</translation>
+        <translation type="obsolete">Nieuwe Invoer</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -708,7 +708,7 @@ opslaan</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Handheld Wachtwoord Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Handheld Wachtwoord Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -716,11 +716,11 @@ opslaan</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>door Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">door Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Vertaling door Ruben Lubbes&lt;br&gt;</translation>
+        <translation type="obsolete">Vertaling door Ruben Lubbes&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -736,7 +736,7 @@ opslaan</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Maak nieuw ZSafe Bestand</translation>
+        <translation type="obsolete">Maak nieuw ZSafe Bestand</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -744,14 +744,14 @@ opslaan</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>ZSafe document opslaan als..</translation>
+        <translation type="obsolete">ZSafe document opslaan als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
-        <translation>Kan de map
+        <translation type="obsolete">Kan de map
 .../Documents/application
 niet maken.
 
@@ -763,7 +763,7 @@ ZSafe zal nu afsluiten.
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
-        <translation>Kan de map
+        <translation type="obsolete">Kan de map
 .../Documents/application/zsafe
 niet maken.
 
@@ -836,11 +836,43 @@ uw nieuwe bestand.</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation>ZSafe versie 2.1.2-jv01b&lt;br&gt;</translation>
+        <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>ZSafe versie 2.1.2&lt;br&gt;</translation>
+        <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/nl/zsame.ts b/i18n/nl/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/nl/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index b433926..767e66a 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -7,14 +7,14 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Den katalogen eksisterer ikke</translation>
+        <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>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 er opphavsrettslig beskyttet 2002-2003
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 og er GPL lisensiert</translation>
@@ -142,7 +142,7 @@ og er GPL lisensiert</translation>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Sikker på at du vil slette
+        <translation type="obsolete">Sikker på at du vil slette
 filene %1 ?</translation>
     </message>
     <message>
@@ -160,7 +160,7 @@ filene %1 ?</translation>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Sikker på at du vil kopiere
+        <translation type="obsolete">Sikker på at du vil kopiere
 filene %1?</translation>
     </message>
     <message>
@@ -169,26 +169,26 @@ filene %1?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 eksisterer. Ok for å overskrive?</translation>
+        <translation type="obsolete">%1 eksisterer. Ok for å overskrive?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Kunne ikke kopiere %1 til %2</translation>
+        <translation type="obsolete">Kunne ikke kopiere %1 til %2</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>Eksisterer. Ok for å overskrive?</translation>
+        <translation type="obsolete">Eksisterer. Ok for å overskrive?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>Kunne ikke kopiere</translation>
+        <translation type="obsolete">Kunne ikke kopiere</translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>til</translation>
+        <translation type="obsolete">til</translation>
     </message>
     <message>
         <source>Copy </source>
@@ -201,13 +201,13 @@ exists. Ok to overwrite?</source>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>Eksisterer allerede.
+        <translation type="obsolete">Eksisterer allerede.
 Er du sikker på at du vil slette?</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Kunne ikke flyttes
+        <translation type="obsolete">Kunne ikke flyttes
 </translation>
     </message>
     <message>
@@ -235,50 +235,91 @@ Er du sikker på at du vil slette?</translation>
         <translation>Kunne ikke endre filnavn</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
+        <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File Search</source>
+        <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
+        <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1?</source>
+        <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AdvancedFm :: </source>
+        <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> kB free</source>
+        <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to View 1</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to View 2</source>
+        <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>Not Yet Implemented</source>
+        <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>Could not copy 
-%1 
-to 
-%2</source>
+        <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/backup.ts b/i18n/no/backup.ts
index 25f4bf6..06c9bc8 100644
--- a/i18n/no/backup.ts
+++ b/i18n/no/backup.ts
@@ -2,10 +2,6 @@
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54,6 +50,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -70,10 +74,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,6 +113,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/no/bartender.ts b/i18n/no/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/no/bartender.ts
+++ b/i18n/no/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/no/bluetooth-manager.ts b/i18n/no/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/no/bluetooth-manager.ts
+++ b/i18n/no/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/no/dagger.ts b/i18n/no/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/no/dagger.ts
+++ b/i18n/no/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/no/launchersettings.ts b/i18n/no/launchersettings.ts
index b54452f..679868d 100644
--- a/i18n/no/launchersettings.ts
+++ b/i18n/no/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/no/libGPRS.ts b/i18n/no/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/no/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libaboutapplet.ts b/i18n/no/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/no/libaboutapplet.ts
+++ b/i18n/no/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/no/libbatteryapplet.ts b/i18n/no/libbatteryapplet.ts
index 2a79a7d..5b48263 100644
--- a/i18n/no/libbatteryapplet.ts
+++ b/i18n/no/libbatteryapplet.ts
@@ -18,10 +18,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,31 +54,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
+        <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
+        <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining: </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No jacket with battery inserted</source>
+        <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no data</source>
+        <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Remaing Power: %1 %2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/libbluetooth.ts b/i18n/no/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/no/libbluetooth.ts
+++ b/i18n/no/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libbrightnessapplet.ts b/i18n/no/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libcable.ts b/i18n/no/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/no/libcable.ts
+++ b/i18n/no/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/libcardmonapplet.ts b/i18n/no/libcardmonapplet.ts
index 3637f01..37329c3 100644
--- a/i18n/no/libcardmonapplet.ts
+++ b/i18n/no/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/libexample_applet.ts b/i18n/no/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/no/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libexample_board.ts b/i18n/no/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/no/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libexample_vpn.ts b/i18n/no/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/no/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libinterfaces.ts b/i18n/no/libinterfaces.ts
index 8239ed9..080cc89 100644
--- a/i18n/no/libinterfaces.ts
+++ b/i18n/no/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/no/libkppp.ts b/i18n/no/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/no/libkppp.ts
+++ b/i18n/no/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/no/liblancard.ts b/i18n/no/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/no/liblancard.ts
+++ b/i18n/no/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/liblockapplet.ts b/i18n/no/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/no/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libmailwrapper.ts b/i18n/no/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/no/libmailwrapper.ts
+++ b/i18n/no/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/no/libmemoryapplet.ts b/i18n/no/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/no/libmemoryapplet.ts
+++ b/i18n/no/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/no/libnetworksettings2.ts b/i18n/no/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/no/libnetworksettings2.ts
+++ b/i18n/no/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/libopiemm2.ts b/i18n/no/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/no/libopiemm2.ts
+++ b/i18n/no/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libopiepim2.ts b/i18n/no/libopiepim2.ts
index 1620e27..98ceba6 100644
--- a/i18n/no/libopiepim2.ts
+++ b/i18n/no/libopiepim2.ts
@@ -215,6 +215,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
@@ -604,6 +707,34 @@ and </source>
         <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>
diff --git a/i18n/no/libopiesecurity2.ts b/i18n/no/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/no/libopiesecurity2.ts
+++ b/i18n/no/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/libopietooth2.ts b/i18n/no/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/no/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libopietooth2applet.ts b/i18n/no/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/no/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libopieui2.ts b/i18n/no/libopieui2.ts
index 0f61518..1f6b6f0 100644
--- a/i18n/no/libopieui2.ts
+++ b/i18n/no/libopieui2.ts
@@ -1,27 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>OTimePickerDialogBase</name>
     <message>
-        <source>FileDialog</source>
+        <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open</source>
+        <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select Directory</source>
+        <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
-        <source>Style</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -29,52 +29,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
-        <source>Time:</source>
+        <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>:</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pick Time:</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OTimePickerDialogBase</source>
+        <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Internal::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Size</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
-        <source>Date</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Name:</source>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/libphasestyle.ts b/i18n/no/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/no/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libppp.ts b/i18n/no/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/no/libppp.ts
+++ b/i18n/no/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/no/libprofile.ts b/i18n/no/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/no/libprofile.ts
+++ b/i18n/no/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/no/libqpickboard.ts b/i18n/no/libqpickboard.ts
index 488fb8f..694b19e 100644
--- a/i18n/no/libqpickboard.ts
+++ b/i18n/no/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libscreenshotapplet.ts b/i18n/no/libscreenshotapplet.ts
index ebc9a78..b882fb9 100644
--- a/i18n/no/libscreenshotapplet.ts
+++ b/i18n/no/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/libtodayaddressbookplugin.ts b/i18n/no/libtodayaddressbookplugin.ts
index ea68edf..1d2a0d8 100644
--- a/i18n/no/libtodayaddressbookplugin.ts
+++ b/i18n/no/libtodayaddressbookplugin.ts
@@ -10,14 +10,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,10 +51,6 @@ Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/no/libtodayexampleplugin.ts b/i18n/no/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/no/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libtodayweatherplugin.ts b/i18n/no/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/no/libtodayweatherplugin.ts
+++ b/i18n/no/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/libvolumeapplet2.ts b/i18n/no/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libvpn.ts b/i18n/no/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/no/libvpn.ts
+++ b/i18n/no/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/libwebstyle.ts b/i18n/no/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/no/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libwlan.ts b/i18n/no/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/no/libwlan.ts
+++ b/i18n/no/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/no/main-tab.ts b/i18n/no/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/no/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/multiauth.ts b/i18n/no/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/networksettings2.ts b/i18n/no/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/no/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/opie-console.ts b/i18n/no/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/no/opie-console.ts
+++ b/i18n/no/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/no/opie-eye.ts b/i18n/no/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/no/opie-eye.ts
+++ b/i18n/no/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/opie-eye_slave.ts b/i18n/no/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/no/opie-eye_slave.ts
+++ b/i18n/no/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/opie-login.ts b/i18n/no/opie-login.ts
index 1f3290b..f96e976 100644
--- a/i18n/no/opie-login.ts
+++ b/i18n/no/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -75,8 +71,51 @@ by an uncaught signal
         <source>Could not switch to new user identity</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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/no/opie-sheet.ts b/i18n/no/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/no/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/opie-update-symlinks.ts b/i18n/no/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/opieirc.ts b/i18n/no/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/no/opieirc.ts
+++ b/i18n/no/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/no/opiemail.ts b/i18n/no/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/no/opiemail.ts
+++ b/i18n/no/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/no/opieplayer2.ts b/i18n/no/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/no/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/no/opierec.ts b/i18n/no/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/no/opierec.ts
+++ b/i18n/no/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/opimconverter.ts b/i18n/no/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/no/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/osearch.ts b/i18n/no/osearch.ts
index e20a0f4..97ed663 100644
--- a/i18n/no/osearch.ts
+++ b/i18n/no/osearch.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -96,35 +96,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show completed tasks</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/oxygen.ts b/i18n/no/oxygen.ts
index 19798b5..be515dc 100644
--- a/i18n/no/oxygen.ts
+++ b/i18n/no/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/no/oyatzee.ts b/i18n/no/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/no/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/packagemanager.ts b/i18n/no/packagemanager.ts
index 2fbaa41..7c12476 100644
--- a/i18n/no/packagemanager.ts
+++ b/i18n/no/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -274,9 +314,6 @@
     </message>
 </context>
 <context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
@@ -296,7 +333,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Klikk her for å oppdatere pakkelister fra servere.</translation>
+        <translation type="obsolete">Klikk her for å oppdatere pakkelister fra servere.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -304,7 +341,7 @@
     </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>
+        <translation type="obsolete">Klikk her for å oppgradere alle installerte pakker dersom en nyere versjon er tilgjengelig.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -312,7 +349,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Klikk her for å laste ned de valgte pakkene. </translation>
+        <translation type="obsolete">Klikk her for å laste ned de valgte pakkene. </translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -320,7 +357,7 @@
     </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>
+        <translation type="obsolete">Klikk her for installere, fjerne eller oppgradere valgte pakker.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -332,7 +369,7 @@
     </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>
+        <translation type="obsolete">Klikk her for å vise pakker som er tilgjengelige, men som ikke er installert.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -340,7 +377,7 @@
     </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>
+        <translation type="obsolete">Klikk her for å vise pakker som er installert på denne enheten.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -348,7 +385,7 @@
     </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>
+        <translation type="obsolete">Klikk her for å vise pakker som er installert på enheten som har en nyere versjon tilgjengelig.</translation>
     </message>
     <message>
         <source>Filter by category</source>
@@ -372,7 +409,7 @@
     </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>
+        <translation type="obsolete">Klikk her for å søke etter tekst i navnene til pakkene.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -380,7 +417,7 @@
     </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>
+        <translation type="obsolete">Klikk her for å finne den neste pakken som inneholder teksten som du søker etter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -400,11 +437,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Klikk her for å konfigurere denne applikasjonen.</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Klikk her for å skjule Søk verktøylinjen.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -558,84 +595,140 @@ er IKKE anbefalt!</translation>
         <translation type="obsolete">Oppdaterer Launcher...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -671,23 +764,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Server</translation>
+        <translation type="obsolete">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Navn:</translation>
+        <translation type="obsolete">Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Adresse:</translation>
+        <translation type="obsolete">Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Aktiv server</translation>
+        <translation type="obsolete">Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Oppdater</translation>
+        <translation type="obsolete">Oppdater</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -745,6 +838,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Feilsøking utdata</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Navn:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Sted:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Navn:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Adresse:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -777,6 +1012,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
@@ -822,9 +1069,6 @@ Click inside the box at the left to select a package.</source>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
diff --git a/i18n/no/powerchord.ts b/i18n/no/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/no/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/no/pyquicklauncher.ts b/i18n/no/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/qpe.ts b/i18n/no/qpe.ts
index e4cc8e0..ed41643 100644
--- a/i18n/no/qpe.ts
+++ b/i18n/no/qpe.ts
@@ -242,6 +242,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -261,6 +268,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/no/security.ts b/i18n/no/security.ts
index 584fa09..ca86afe 100644
--- a/i18n/no/security.ts
+++ b/i18n/no/security.ts
@@ -70,47 +70,35 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -137,23 +125,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/sfcave-sdl.ts b/i18n/no/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/sfcave.ts b/i18n/no/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/no/sfcave.ts
+++ b/i18n/no/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/simple-icon.ts b/i18n/no/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/no/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/simple-main.ts b/i18n/no/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/no/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/simple-pim.ts b/i18n/no/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/no/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/simple.ts b/i18n/no/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/no/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/stocktickertest.ts b/i18n/no/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/no/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/sysinfo.ts b/i18n/no/sysinfo.ts
index 3dd8782..f5e37e4 100644
--- a/i18n/no/sysinfo.ts
+++ b/i18n/no/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -310,6 +306,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -345,5 +345,9 @@ to this process?</source>
         <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/no/tableviewer.ts b/i18n/no/tableviewer.ts
index 7d41b6f..4570c99 100644
--- a/i18n/no/tableviewer.ts
+++ b/i18n/no/tableviewer.ts
@@ -1,16 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
diff --git a/i18n/no/textedit.ts b/i18n/no/textedit.ts
index 011e5a1..cd9ae1f 100644
--- a/i18n/no/textedit.ts
+++ b/i18n/no/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
 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>
diff --git a/i18n/no/today.ts b/i18n/no/today.ts
index 61cce5f..1c9203a 100644
--- a/i18n/no/today.ts
+++ b/i18n/no/today.ts
@@ -10,15 +10,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins found</source>
+        <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins activated</source>
+        <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Owned by </source>
+        <source>Today</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>
diff --git a/i18n/no/todolist.ts b/i18n/no/todolist.ts
index 94744dd..12df3eb 100644
--- a/i18n/no/todolist.ts
+++ b/i18n/no/todolist.ts
@@ -9,65 +9,68 @@
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Information</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
     <message>
-        <source>Alarms</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Task Editor</source>
+        <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>Enter Task</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>silent</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>loud</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Todolist</source>
+        <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QWidget</name>
+    <name>Opie</name>
     <message>
-        <source>New from template</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Click here to create a new task.</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -75,46 +78,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
+        <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -131,18 +109,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -157,14 +123,6 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -210,10 +168,6 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/no/wellenreiter.ts b/i18n/no/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/no/wellenreiter.ts
+++ b/i18n/no/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/no/zlines.ts b/i18n/no/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/no/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/zsafe.ts b/i18n/no/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/no/zsafe.ts
+++ b/i18n/no/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/zsame.ts b/i18n/no/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/no/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index 752b966..c357742 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Folder nie istnieje</translation>
+        <translation type="obsolete">Folder nie istnieje</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -148,18 +148,18 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Nie mozna skopiowac
+        <translation type="obsolete">Nie mozna skopiowac
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>do</translation>
+        <translation type="obsolete">do</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Nie mozna przeniesc</translation>
+        <translation type="obsolete">Nie mozna przeniesc</translation>
     </message>
     <message>
         <source>Add To Documents</source>
@@ -176,7 +176,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Czy na pewno usunac 
+        <translation type="obsolete">Czy na pewno usunac 
 %1 plikow?</translation>
     </message>
     <message>
@@ -186,7 +186,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Czy na pewno skopiowac
+        <translation type="obsolete">Czy na pewno skopiowac
 %1 plikow?</translation>
     </message>
     <message>
@@ -196,29 +196,29 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 istnieje. Czy nadpisac?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>juz istnieje.
+        <translation type="obsolete">juz istnieje.
 Czy na pewno chcesz go usunac?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 istnieje. Czy nadpisac?</translation>
+        <translation type="obsolete">%1 istnieje. Czy nadpisac?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Nie mozna skopiowac %1 do %2</translation>
+        <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>Zaawansowany Menedzer Plikow
+        <translation type="obsolete">Zaawansowany Menedzer Plikow
 prawa autorskie 2002-2003
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 na licencji GPL</translation>
@@ -239,7 +239,7 @@ na licencji GPL</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Nie mozna usunac aktualnego folderu
+        <translation type="obsolete">Nie mozna usunac aktualnego folderu
 z zakladek.
 Nie ma go w zakladkach!</translation>
     </message>
@@ -250,13 +250,13 @@ Nie ma go w zakladkach!</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Czy na pewno usunac %1
+        <translation type="obsolete">Czy na pewno usunac %1
 wraz z zawartoscia?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Czy na pewno usunac
+        <translation type="obsolete">Czy na pewno usunac
 %1?</translation>
     </message>
     <message>
@@ -280,10 +280,67 @@ wraz z zawartoscia?</translation>
         <translation>Jeszcze niezaimplementowane</translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
+        <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>
diff --git a/i18n/pl/backup.ts b/i18n/pl/backup.ts
index 99ab991..e168eb1 100644
--- a/i18n/pl/backup.ts
+++ b/i18n/pl/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Archiwizacja i odzyskiwanie... pracuje...</translation>
+        <translation type="obsolete">Archiwizacja i odzyskiwanie... pracuje...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -63,6 +63,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -80,7 +88,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Zapisz do</translation>
+        <translation type="obsolete">Zapisz do</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -126,6 +134,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/pl/bartender.ts b/i18n/pl/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/pl/bartender.ts
+++ b/i18n/pl/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/pl/bluetooth-manager.ts b/i18n/pl/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/pl/bluetooth-manager.ts
+++ b/i18n/pl/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/pl/dagger.ts b/i18n/pl/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/pl/dagger.ts
+++ b/i18n/pl/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/pl/launchersettings.ts b/i18n/pl/launchersettings.ts
index 2e6dd49..b98ec96 100644
--- a/i18n/pl/launchersettings.ts
+++ b/i18n/pl/launchersettings.ts
@@ -180,6 +180,14 @@
         <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>
diff --git a/i18n/pl/libGPRS.ts b/i18n/pl/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/pl/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libaboutapplet.ts b/i18n/pl/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/pl/libaboutapplet.ts
+++ b/i18n/pl/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/pl/libbatteryapplet.ts b/i18n/pl/libbatteryapplet.ts
index 0e8a769..88d0993 100644
--- a/i18n/pl/libbatteryapplet.ts
+++ b/i18n/pl/libbatteryapplet.ts
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Pozostały procent energii</translation>
+        <translation type="obsolete">Pozostały procent energii</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -47,7 +47,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Pozostały czas działania baterii</translation>
+        <translation type="obsolete">Pozostały czas działania baterii</translation>
     </message>
     <message>
         <source>Close</source>
@@ -71,11 +71,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Pozostały procent energii:</translation>
+        <translation type="obsolete">Pozostały procent energii:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Pozostały czas działania baterii:</translation>
+        <translation type="obsolete">Pozostały czas działania baterii:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -87,11 +87,28 @@
     </message>
     <message>
         <source>Ipaq  </source>
-        <translation>Ipaq</translation>
+        <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/libbluetooth.ts b/i18n/pl/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/pl/libbluetooth.ts
+++ b/i18n/pl/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libbrightnessapplet.ts b/i18n/pl/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libcable.ts b/i18n/pl/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/pl/libcable.ts
+++ b/i18n/pl/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/libcardmonapplet.ts b/i18n/pl/libcardmonapplet.ts
index f0843b2..847d4b8 100644
--- a/i18n/pl/libcardmonapplet.ts
+++ b/i18n/pl/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Eject card 1: %1</source>
         <translation>Odlacz karte 1: %1</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libexample_applet.ts b/i18n/pl/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/pl/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libexample_board.ts b/i18n/pl/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/pl/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libexample_vpn.ts b/i18n/pl/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/pl/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libinterfaces.ts b/i18n/pl/libinterfaces.ts
index c0c930c..a8d8bca 100644
--- a/i18n/pl/libinterfaces.ts
+++ b/i18n/pl/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Restart interfejsu</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/pl/libkppp.ts b/i18n/pl/libkppp.ts
index 0d6a7d9..5c689e3 100644
--- a/i18n/pl/libkppp.ts
+++ b/i18n/pl/libkppp.ts
@@ -389,6 +389,10 @@ zgodnie ze swoimi potrzebami</translation>
         <source>You must enter a unique device name</source>
         <translation>Musisz podac unikalna nazwe urzadzenia</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Blad</translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/pl/liblancard.ts b/i18n/pl/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/pl/liblancard.ts
+++ b/i18n/pl/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/liblockapplet.ts b/i18n/pl/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/pl/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libmailwrapper.ts b/i18n/pl/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/pl/libmailwrapper.ts
+++ b/i18n/pl/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/pl/libmemoryapplet.ts b/i18n/pl/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/pl/libmemoryapplet.ts
+++ b/i18n/pl/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/pl/libnetworksettings2.ts b/i18n/pl/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/pl/libnetworksettings2.ts
+++ b/i18n/pl/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/libopiemm2.ts b/i18n/pl/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/pl/libopiemm2.ts
+++ b/i18n/pl/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libopiepim2.ts b/i18n/pl/libopiepim2.ts
index 96435a5..5a967fc 100644
--- a/i18n/pl/libopiepim2.ts
+++ b/i18n/pl/libopiepim2.ts
@@ -585,6 +585,109 @@ i</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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1020,6 +1123,34 @@ i</translation>
         <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>
diff --git a/i18n/pl/libopiesecurity2.ts b/i18n/pl/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/pl/libopiesecurity2.ts
+++ b/i18n/pl/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/libopietooth2.ts b/i18n/pl/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/pl/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libopietooth2applet.ts b/i18n/pl/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/pl/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libopieui2.ts b/i18n/pl/libopieui2.ts
index d20f7f4..4c01222 100644
--- a/i18n/pl/libopieui2.ts
+++ b/i18n/pl/libopieui2.ts
@@ -112,19 +112,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">Plik</translation>
+        <translation type="obsolete">Plik</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Otwórz</translation>
+        <translation type="obsolete">Otwórz</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Zapisz</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zapisz</translation>
     </message>
 </context>
 <context>
@@ -172,15 +168,11 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Styl</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Rozmiar</translation>
     </message>
 </context>
 <context>
@@ -437,15 +429,19 @@ i</translation>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">Plik</translation>
+        <translation type="unfinished">Plik</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Otwórz</translation>
+        <translation type="unfinished">Otwórz</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Zapisz</translation>
+        <translation type="unfinished">Zapisz</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -459,11 +455,15 @@ i</translation>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Styl</translation>
+        <translation type="unfinished">Styl</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Rozmiar</translation>
+        <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>
diff --git a/i18n/pl/libphasestyle.ts b/i18n/pl/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/pl/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libppp.ts b/i18n/pl/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/pl/libppp.ts
+++ b/i18n/pl/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/pl/libprofile.ts b/i18n/pl/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/pl/libprofile.ts
+++ b/i18n/pl/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/pl/libqpickboard.ts b/i18n/pl/libqpickboard.ts
index 7eef6c6..eb06783 100644
--- a/i18n/pl/libqpickboard.ts
+++ b/i18n/pl/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libscreenshotapplet.ts b/i18n/pl/libscreenshotapplet.ts
index 15bd7b3..ded2f36 100644
--- a/i18n/pl/libscreenshotapplet.ts
+++ b/i18n/pl/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libtodayaddressbookplugin.ts b/i18n/pl/libtodayaddressbookplugin.ts
index a1eee42..2505e2c 100644
--- a/i18n/pl/libtodayaddressbookplugin.ts
+++ b/i18n/pl/libtodayaddressbookplugin.ts
@@ -11,11 +11,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Ogranicz linię do X znaków:</translation>
+        <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>Po ilu znakach powinna być obcięta informacja o zadaniu</translation>
+        <translation type="obsolete">Po ilu znakach powinna być obcięta informacja o zadaniu</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
@@ -61,7 +61,7 @@ jeśli bliżej niż</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>By uaktywnić ustawienia: Uruchom ponownie aplikację!</translation>
+        <translation type="obsolete">By uaktywnić ustawienia: Uruchom ponownie aplikację!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
diff --git a/i18n/pl/libtodayexampleplugin.ts b/i18n/pl/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/pl/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libtodayweatherplugin.ts b/i18n/pl/libtodayweatherplugin.ts
index eab7d24..b39d7cd 100644
--- a/i18n/pl/libtodayweatherplugin.ts
+++ b/i18n/pl/libtodayweatherplugin.ts
@@ -106,11 +106,15 @@ Pres: </source>
     </message>
     <message>
         <source> hPa</source>
-        <translation>hPa</translation>
+        <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/libvolumeapplet2.ts b/i18n/pl/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libvpn.ts b/i18n/pl/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/pl/libvpn.ts
+++ b/i18n/pl/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/libwebstyle.ts b/i18n/pl/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/pl/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libwlan.ts b/i18n/pl/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/pl/libwlan.ts
+++ b/i18n/pl/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/pl/main-tab.ts b/i18n/pl/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/pl/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/multiauth.ts b/i18n/pl/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/networksettings2.ts b/i18n/pl/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/pl/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/opie-console.ts b/i18n/pl/opie-console.ts
index 9d35fa3..ae0a37e 100644
--- a/i18n/pl/opie-console.ts
+++ b/i18n/pl/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation>Edycja Klawisza</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation>9600 bodow</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 bodow</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 bodow</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 bodow</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -746,7 +792,7 @@
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Wybieranie numeru nie powiodlo sie.</translation>
+        <translation type="obsolete">Wybieranie numeru nie powiodlo sie.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -784,6 +830,14 @@
         <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>
@@ -804,19 +858,19 @@
     </message>
     <message>
         <source>Font size</source>
-        <translation>Rozmiar czcionki</translation>
+        <translation type="obsolete">Rozmiar czcionki</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>mala</translation>
+        <translation type="obsolete">mala</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>srednia</translation>
+        <translation type="obsolete">srednia</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>wielka</translation>
+        <translation type="obsolete">wielka</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/pl/opie-eye.ts b/i18n/pl/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/pl/opie-eye.ts
+++ b/i18n/pl/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/opie-eye_slave.ts b/i18n/pl/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/pl/opie-eye_slave.ts
+++ b/i18n/pl/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/opie-login.ts b/i18n/pl/opie-login.ts
index 5e024b4..c8f641f 100644
--- a/i18n/pl/opie-login.ts
+++ b/i18n/pl/opie-login.ts
@@ -9,7 +9,7 @@ aby skalibrowac ekran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Witamy w Opie</translation>
+        <translation type="obsolete">Witamy w Opie</translation>
     </message>
 </context>
 <context>
@@ -83,8 +83,51 @@ przez nieprzechwycony sygnal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/pl/opie-sheet.ts b/i18n/pl/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/pl/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/opie-update-symlinks.ts b/i18n/pl/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/opieirc.ts b/i18n/pl/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/pl/opieirc.ts
+++ b/i18n/pl/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/pl/opiemail.ts b/i18n/pl/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/pl/opiemail.ts
+++ b/i18n/pl/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/pl/opieplayer2.ts b/i18n/pl/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/pl/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/pl/opierec.ts b/i18n/pl/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/pl/opierec.ts
+++ b/i18n/pl/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/opimconverter.ts b/i18n/pl/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/pl/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/osearch.ts b/i18n/pl/osearch.ts
index 4cfeb8a..2047b02 100644
--- a/i18n/pl/osearch.ts
+++ b/i18n/pl/osearch.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Wielkość liter znacząca</translation>
+        <translation type="obsolete">Wielkość liter znacząca</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -65,6 +65,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -97,15 +101,15 @@
     </message>
     <message>
         <source>show completed tasks</source>
-        <translation>pokazuj ukończone zadania</translation>
+        <translation type="obsolete">pokazuj ukończone zadania</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>pokazuj przeszłe wydarzenia</translation>
+        <translation type="obsolete">pokazuj przeszłe wydarzenia</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>szukaj w datach</translation>
+        <translation type="obsolete">szukaj w datach</translation>
     </message>
     <message>
         <source>File: </source>
@@ -121,11 +125,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>przeszukuj zawartość</translation>
+        <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/oxygen.ts b/i18n/pl/oxygen.ts
index 95ea62e..8a90e8e 100644
--- a/i18n/pl/oxygen.ts
+++ b/i18n/pl/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/pl/oyatzee.ts b/i18n/pl/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/pl/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/packagemanager.ts b/i18n/pl/packagemanager.ts
index 7b96474..eef11b3 100644
--- a/i18n/pl/packagemanager.ts
+++ b/i18n/pl/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -377,7 +417,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Kliknij tu aby aktualizowac liste pakietow z serwera.</translation>
+        <translation type="obsolete">Kliknij tu aby aktualizowac liste pakietow z serwera.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -385,7 +425,7 @@
     </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>
+        <translation type="obsolete">Kliknij tu aby aktualizowac wszystkie zainstalowane pakiety, jasli dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -393,7 +433,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Kliknij tu aby sciagnac aktualnie wybrane pakiety.</translation>
+        <translation type="obsolete">Kliknij tu aby sciagnac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -401,7 +441,7 @@
     </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>
+        <translation type="obsolete">Kliknij tu aby instalowac, usunac lub aktualizowac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -413,7 +453,7 @@
     </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>
+        <translation type="obsolete">Kliknij tu aby wyswietlic dostepne pakiety, ktore nie zostaly zainstalowane.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -421,7 +461,7 @@
     </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>
+        <translation type="obsolete">Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -429,7 +469,7 @@
     </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>
+        <translation type="obsolete">Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety, dla ktorych dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Filter by category</source>
@@ -453,7 +493,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Kliknij tu aby wyszukac tekst w nazwach pakietow.</translation>
+        <translation type="obsolete">Kliknij tu aby wyszukac tekst w nazwach pakietow.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -461,7 +501,7 @@
     </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>
+        <translation type="obsolete">Kliknij tu aby znalezc nastepna nazwe pakietu zawierajaca szukany tekst.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -481,11 +521,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Kliknij tu aby skonfigurowac ta aplikacje.</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Kliknij tu aby ukryc pasek wyszukiwania.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -635,84 +675,140 @@ Czy jestes pewien?</translation>
         <translation type="obsolete">Aktualizuje Launcher...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -748,23 +844,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Serwer</translation>
+        <translation type="obsolete">Serwer</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Nazwa:</translation>
+        <translation type="obsolete">Nazwa:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Adres:</translation>
+        <translation type="obsolete">Adres:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Serwer aktywny</translation>
+        <translation type="obsolete">Serwer aktywny</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Aktualizuj</translation>
+        <translation type="obsolete">Aktualizuj</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -822,6 +918,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Komunikaty problemow</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nazwa:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Lokalizacja:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nazwa:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Adres:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -854,6 +1092,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/pl/powerchord.ts b/i18n/pl/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/pl/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/pl/pyquicklauncher.ts b/i18n/pl/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index 7564994..1842a65 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -251,6 +251,13 @@ aby skalibrować ekran.</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>
@@ -270,6 +277,13 @@ aby skalibrować ekran.</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>
diff --git a/i18n/pl/security.ts b/i18n/pl/security.ts
index 525ccc7..39380e3 100644
--- a/i18n/pl/security.ts
+++ b/i18n/pl/security.ts
@@ -76,7 +76,7 @@ Możesz wybrać tylko skonfigurowanego użytkownika.</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished">&lt;p&gt;Wszystkie zakresy użytkownika będę stracone.</translation>
+        <translation type="obsolete">&lt;p&gt;Wszystkie zakresy użytkownika będę stracone.</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -84,31 +84,31 @@ Możesz wybrać tylko skonfigurowanego użytkownika.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -118,6 +118,26 @@ Możesz wybrać tylko skonfigurowanego użytkownika.</translation>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -142,23 +162,43 @@ Możesz wybrać tylko skonfigurowanego użytkownika.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <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>
diff --git a/i18n/pl/sfcave.ts b/i18n/pl/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/pl/sfcave.ts
+++ b/i18n/pl/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/simple-icon.ts b/i18n/pl/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/pl/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/simple-main.ts b/i18n/pl/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/pl/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/simple-pim.ts b/i18n/pl/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/pl/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/simple.ts b/i18n/pl/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/pl/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/stocktickertest.ts b/i18n/pl/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/pl/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/sysinfo.ts b/i18n/pl/sysinfo.ts
index c924c8f..3b040a7 100644
--- a/i18n/pl/sysinfo.ts
+++ b/i18n/pl/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -338,6 +334,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -381,5 +381,9 @@ to this process?</source>
         <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/tableviewer.ts b/i18n/pl/tableviewer.ts
index 7b90316..3ad7396 100644
--- a/i18n/pl/tableviewer.ts
+++ b/i18n/pl/tableviewer.ts
@@ -1,16 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
diff --git a/i18n/pl/textedit.ts b/i18n/pl/textedit.ts
index 27dad8b..521a019 100644
--- a/i18n/pl/textedit.ts
+++ b/i18n/pl/textedit.ts
@@ -201,6 +201,10 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
         <translation>Czy na pewno chcesz&lt;BR&gt;&lt;b&gt;usunac&lt;/b&gt; aktualny plik
 z dysku?&lt;BR&gt;Operacja jest &lt;b&gt;nieodwracalna!&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 2c218a7..724e2c9 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Dzisiaj</translation>
+        <translation type="unfinished">Dzisiaj</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Nie znaleziono żadnych wtyczek</translation>
+        <translation type="obsolete">Nie znaleziono żadnych wtyczek</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -25,6 +25,14 @@
         <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>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index a0bb02f..3a4f053 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -9,6 +9,29 @@
         <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>
@@ -34,6 +57,17 @@
     </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>
@@ -53,46 +87,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Opie ZróbTo</translation>
+        <translation type="obsolete">Opie ZróbTo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Nowe z szablonu</translation>
+        <translation type="obsolete">Nowe z szablonu</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nowe zadanie</translation>
+        <translation type="obsolete">Nowe zadanie</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Kliknij tu żeby stworzyć nowe zadanie.</translation>
+        <translation type="obsolete">Kliknij tu żeby stworzyć nowe zadanie.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Edytuj Zadanie</translation>
+        <translation type="obsolete">Edytuj Zadanie</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Kliknij tu żeby zmodyfikować aktualne zadanie.</translation>
+        <translation type="obsolete">Kliknij tu żeby zmodyfikować aktualne zadanie.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Zobacz zadanie</translation>
+        <translation type="obsolete">Zobacz zadanie</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Usuń...</translation>
+        <translation type="obsolete">Usuń...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Kliknij tu żeby usunąć aktualne zadanie.</translation>
+        <translation type="obsolete">Kliknij tu żeby usunąć aktualne zadanie.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Usuń wszystkie...</translation>
+        <translation type="obsolete">Usuń wszystkie...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,15 +134,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>Emituj</translation>
+        <translation type="obsolete">Emituj</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Kliknij tu żeby wysłać aktualne zadanie do innego urządzenia.</translation>
+        <translation type="obsolete">Kliknij tu żeby wysłać aktualne zadanie do innego urządzenia.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Szukaj</translation>
+        <translation type="obsolete">Szukaj</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -128,15 +162,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Dane</translation>
+        <translation type="obsolete">Dane</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategoria</translation>
+        <translation type="obsolete">Kategoria</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opcje</translation>
+        <translation type="obsolete">Opcje</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -160,7 +194,7 @@ Na liście umieszczone są nastepujące informacje:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Wszystkie kategorie</translation>
+        <translation type="obsolete">Wszystkie kategorie</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -194,7 +228,7 @@ Wyjść mimo to?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Nieprzypisane</translation>
+        <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>
@@ -206,7 +240,7 @@ Wyjść mimo to?</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplikuj</translation>
+        <translation type="obsolete">Duplikuj</translation>
     </message>
     <message>
         <source>C.</source>
@@ -226,7 +260,7 @@ Wyjść mimo to?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Konfiguruj szablony</translation>
+        <translation type="obsolete">Konfiguruj szablony</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/pl/wellenreiter.ts b/i18n/pl/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/pl/wellenreiter.ts
+++ b/i18n/pl/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/pl/zlines.ts b/i18n/pl/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/pl/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/zsafe.ts b/i18n/pl/zsafe.ts
index ab8c379..e13c308 100644
--- a/i18n/pl/zsafe.ts
+++ b/i18n/pl/zsafe.ts
@@ -476,7 +476,7 @@ pokazuje listę katalogów i plików</translation>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Nie można utworzyć katalogu
+        <translation type="obsolete">Nie można utworzyć katalogu
 %1
 
 ZSafe zostanie zamknięty.</translation>
@@ -559,7 +559,7 @@ ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -607,7 +607,7 @@ ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Edytuj wpis</translation>
+        <translation type="obsolete">Edytuj wpis</translation>
     </message>
     <message>
         <source>Username</source>
@@ -619,7 +619,7 @@ ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Nowy wpis</translation>
+        <translation type="obsolete">Nowy wpis</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -747,7 +747,7 @@ password</source>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Menedżer haseł&lt;br&gt;</translation>
+        <translation type="obsolete">Menedżer haseł&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -755,11 +755,11 @@ password</source>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>autor: Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">autor: Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Tłumaczenia Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Tłumaczenia Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -775,7 +775,7 @@ password</source>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Twórz nowy dokument ZSafe</translation>
+        <translation type="obsolete">Twórz nowy dokument ZSafe</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -783,14 +783,14 @@ password</source>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Zapisz dokument ZSafe jako..</translation>
+        <translation type="obsolete">Zapisz dokument ZSafe jako..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
-        <translation>Nie można utworzyć katalogu
+        <translation type="obsolete">Nie można utworzyć katalogu
 .../Documents/application
 
 ZSafe zostanie zamknięty.</translation>
@@ -800,7 +800,7 @@ ZSafe zostanie zamknięty.</translation>
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
-        <translation>Nie można utworzyć katalogu
+        <translation type="obsolete">Nie można utworzyć katalogu
 .../Documents/application/zsafe
 
 ZSafe zostanie zamknięty.</translation>
@@ -867,11 +867,43 @@ dokumentu.</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation>ZSafe wersja 2.1.2-jv01b&lt;br&gt;</translation>
+        <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>ZSafe wersja 2.1.2&lt;br&gt;</translation>
+        <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/pl/zsame.ts b/i18n/pl/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/pl/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index bd2c1ad..a2b4b3e 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>A directoria não existe</translation>
+        <translation type="obsolete">A directoria não existe</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -140,19 +140,19 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Não foi possivel copiar
+        <translation type="obsolete">Não foi possivel copiar
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>para
+        <translation type="obsolete">para
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Não foi possível mover
+        <translation type="obsolete">Não foi possível mover
 </translation>
     </message>
     <message>
@@ -170,7 +170,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Apagar mesmo
+        <translation type="obsolete">Apagar mesmo
 os ficheiros %1?</translation>
     </message>
     <message>
@@ -180,7 +180,7 @@ os ficheiros %1?</translation>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Copiar mesmo
+        <translation type="obsolete">Copiar mesmo
 os ficheiros %1?</translation>
     </message>
     <message>
@@ -190,29 +190,29 @@ os ficheiros %1?</translation>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 existe. Sobrepor?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>já existe.
+        <translation type="obsolete">já existe.
 Quer mesmo apagá-lo?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 existe. Sobrepor?</translation>
+        <translation type="obsolete">%1 existe. Sobrepor?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Não foi possível copiar %1 para %2</translation>
+        <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>Gestor de Ficheiros Avançado
+        <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>
@@ -233,7 +233,7 @@ e licenciado sob a licença GPL</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Não é possível apagar a directoria
+        <translation type="obsolete">Não é possível apagar a directoria
 dos atalhos.
 Não existe na lista!</translation>
     </message>
@@ -244,14 +244,14 @@ Não existe na lista!</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Apagar mesmo
+        <translation type="obsolete">Apagar mesmo
 os ficheiros %1
 e os seus conteúdos?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Apagar mesmo
+        <translation type="obsolete">Apagar mesmo
 %1?</translation>
     </message>
     <message>
@@ -287,11 +287,75 @@ e os seus conteúdos?</translation>
 %1 
 to 
 %2</source>
-        <translation>Não foi possível copiar
+        <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>
diff --git a/i18n/pt/backup.ts b/i18n/pt/backup.ts
index de96681..ee9c88b 100644
--- a/i18n/pt/backup.ts
+++ b/i18n/pt/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Cópia de Segurança... a processar...</translation>
+        <translation type="obsolete">Cópia de Segurança... a processar...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -63,6 +63,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -80,7 +88,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Gravar Para</translation>
+        <translation type="obsolete">Gravar Para</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -126,6 +134,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/pt/bartender.ts b/i18n/pt/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/pt/bartender.ts
+++ b/i18n/pt/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/pt/bluetooth-manager.ts b/i18n/pt/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/pt/bluetooth-manager.ts
+++ b/i18n/pt/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/pt/dagger.ts b/i18n/pt/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/pt/dagger.ts
+++ b/i18n/pt/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/pt/launchersettings.ts b/i18n/pt/launchersettings.ts
index 6fb0eb1..7f74aac 100644
--- a/i18n/pt/launchersettings.ts
+++ b/i18n/pt/launchersettings.ts
@@ -176,6 +176,14 @@
         <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>
diff --git a/i18n/pt/libGPRS.ts b/i18n/pt/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/pt/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libaboutapplet.ts b/i18n/pt/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/pt/libaboutapplet.ts
+++ b/i18n/pt/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/pt/libbatteryapplet.ts b/i18n/pt/libbatteryapplet.ts
index 7b1b8eb..88a3abc 100644
--- a/i18n/pt/libbatteryapplet.ts
+++ b/i18n/pt/libbatteryapplet.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Percentagem de bateria restante</translation>
+        <translation type="obsolete">Percentagem de bateria restante</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Tempo de bateria restante</translation>
+        <translation type="obsolete">Tempo de bateria restante</translation>
     </message>
     <message>
         <source>Battery status</source>
@@ -71,11 +71,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Percentagem de bateria restante:</translation>
+        <translation type="obsolete">Percentagem de bateria restante:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Tempo de bateria restante:</translation>
+        <translation type="obsolete">Tempo de bateria restante:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -87,11 +87,28 @@
     </message>
     <message>
         <source>Ipaq  </source>
-        <translation>Ipaq</translation>
+        <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/libbluetooth.ts b/i18n/pt/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/pt/libbluetooth.ts
+++ b/i18n/pt/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libbrightnessapplet.ts b/i18n/pt/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libcable.ts b/i18n/pt/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/pt/libcable.ts
+++ b/i18n/pt/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/libcardmonapplet.ts b/i18n/pt/libcardmonapplet.ts
index 3548475..c790cac 100644
--- a/i18n/pt/libcardmonapplet.ts
+++ b/i18n/pt/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Eject card 1: %1</source>
         <translation>Ejectar cartão 1: %1</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libexample_applet.ts b/i18n/pt/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/pt/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libexample_board.ts b/i18n/pt/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/pt/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libexample_vpn.ts b/i18n/pt/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/pt/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libinterfaces.ts b/i18n/pt/libinterfaces.ts
index a585e4e..3835b70 100644
--- a/i18n/pt/libinterfaces.ts
+++ b/i18n/pt/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Reiniciar Interface</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/pt/libkppp.ts b/i18n/pt/libkppp.ts
index b7bcdc9..45044d5 100644
--- a/i18n/pt/libkppp.ts
+++ b/i18n/pt/libkppp.ts
@@ -440,6 +440,10 @@ novo, que poderão ser modificadas</translation>
         <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>
diff --git a/i18n/pt/liblancard.ts b/i18n/pt/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/pt/liblancard.ts
+++ b/i18n/pt/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/liblockapplet.ts b/i18n/pt/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/pt/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libmailwrapper.ts b/i18n/pt/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/pt/libmailwrapper.ts
+++ b/i18n/pt/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/pt/libmemoryapplet.ts b/i18n/pt/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/pt/libmemoryapplet.ts
+++ b/i18n/pt/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/pt/libnetworksettings2.ts b/i18n/pt/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/pt/libnetworksettings2.ts
+++ b/i18n/pt/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/libopiemm2.ts b/i18n/pt/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/pt/libopiemm2.ts
+++ b/i18n/pt/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libopiepim2.ts b/i18n/pt/libopiepim2.ts
index 8479d51..8015548 100644
--- a/i18n/pt/libopiepim2.ts
+++ b/i18n/pt/libopiepim2.ts
@@ -597,6 +597,109 @@ e</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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1048,6 +1151,34 @@ e</translation>
         <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>
diff --git a/i18n/pt/libopiesecurity2.ts b/i18n/pt/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/pt/libopiesecurity2.ts
+++ b/i18n/pt/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/libopietooth2.ts b/i18n/pt/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/pt/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libopietooth2applet.ts b/i18n/pt/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/pt/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libopieui2.ts b/i18n/pt/libopieui2.ts
index b3b500b..02965c7 100644
--- a/i18n/pt/libopieui2.ts
+++ b/i18n/pt/libopieui2.ts
@@ -112,19 +112,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">DiálogoFicheiro</translation>
+        <translation type="obsolete">DiálogoFicheiro</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Abrir</translation>
+        <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Gravar</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Gravar</translation>
     </message>
 </context>
 <context>
@@ -172,15 +168,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Tamanho</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
     </message>
 </context>
 <context>
@@ -449,15 +445,19 @@ e</translation>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">DiálogoFicheiro</translation>
+        <translation type="unfinished">DiálogoFicheiro</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Gravar</translation>
+        <translation type="unfinished">Gravar</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -471,15 +471,15 @@ e</translation>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
+        <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pt/libphasestyle.ts b/i18n/pt/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/pt/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libppp.ts b/i18n/pt/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/pt/libppp.ts
+++ b/i18n/pt/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/pt/libprofile.ts b/i18n/pt/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/pt/libprofile.ts
+++ b/i18n/pt/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/pt/libqpickboard.ts b/i18n/pt/libqpickboard.ts
index 7eef6c6..eb06783 100644
--- a/i18n/pt/libqpickboard.ts
+++ b/i18n/pt/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libscreenshotapplet.ts b/i18n/pt/libscreenshotapplet.ts
index eccb682..4d6d749 100644
--- a/i18n/pt/libscreenshotapplet.ts
+++ b/i18n/pt/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation>Falhou a ligação a %1.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodayaddressbookplugin.ts b/i18n/pt/libtodayaddressbookplugin.ts
index 7575032..d7230ab 100644
--- a/i18n/pt/libtodayaddressbookplugin.ts
+++ b/i18n/pt/libtodayaddressbookplugin.ts
@@ -11,11 +11,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Cortar a linha ao fim de X caracteres:</translation>
+        <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>Cortar a linha ao fim de quantos caractéres</translation>
+        <translation type="obsolete">Cortar a linha ao fim de quantos caractéres</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="unfinished">Para activar as alterações reinicie a aplicação!</translation>
+        <translation type="obsolete">Para activar as alterações reinicie a aplicação!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
diff --git a/i18n/pt/libtodayexampleplugin.ts b/i18n/pt/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/pt/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libtodayweatherplugin.ts b/i18n/pt/libtodayweatherplugin.ts
index fc0e3da..733c69f 100644
--- a/i18n/pt/libtodayweatherplugin.ts
+++ b/i18n/pt/libtodayweatherplugin.ts
@@ -107,11 +107,15 @@ Pressão:</translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation>hPa</translation>
+        <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/libvolumeapplet2.ts b/i18n/pt/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libvpn.ts b/i18n/pt/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/pt/libvpn.ts
+++ b/i18n/pt/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/libwebstyle.ts b/i18n/pt/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/pt/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libwlan.ts b/i18n/pt/libwlan.ts
index 08f2b53..e2583e5 100644
--- a/i18n/pt/libwlan.ts
+++ b/i18n/pt/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -197,9 +194,6 @@
     </message>
 </context>
 <context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/pt/main-tab.ts b/i18n/pt/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/pt/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/multiauth.ts b/i18n/pt/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/networksettings2.ts b/i18n/pt/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/pt/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/opie-console.ts b/i18n/pt/opie-console.ts
index 2e497ad..6e47c70 100644
--- a/i18n/pt/opie-console.ts
+++ b/i18n/pt/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation>Editar Tecla</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation>9600 baud</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 baud</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 baud</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 baud</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -746,7 +792,7 @@
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Falhou a marcação do número.</translation>
+        <translation type="obsolete">Falhou a marcação do número.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -784,6 +830,14 @@
         <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>
@@ -804,19 +858,19 @@
     </message>
     <message>
         <source>Font size</source>
-        <translation>Tamanho da fonte</translation>
+        <translation type="obsolete">Tamanho da fonte</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>pequena</translation>
+        <translation type="obsolete">pequena</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>média</translation>
+        <translation type="obsolete">média</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>grande</translation>
+        <translation type="obsolete">grande</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/pt/opie-eye.ts b/i18n/pt/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/pt/opie-eye.ts
+++ b/i18n/pt/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/opie-eye_slave.ts b/i18n/pt/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/pt/opie-eye_slave.ts
+++ b/i18n/pt/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/opie-login.ts b/i18n/pt/opie-login.ts
index 79dee5a..3f2270f 100644
--- a/i18n/pt/opie-login.ts
+++ b/i18n/pt/opie-login.ts
@@ -9,7 +9,7 @@ precisão para calibrar o ecrâ.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bem vindo ao Opie</translation>
+        <translation type="obsolete">Bem vindo ao Opie</translation>
     </message>
 </context>
 <context>
@@ -93,8 +93,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/pt/opie-sheet.ts b/i18n/pt/opie-sheet.ts
index a498eb4..96252f3 100644
--- a/i18n/pt/opie-sheet.ts
+++ b/i18n/pt/opie-sheet.ts
@@ -497,143 +497,143 @@
     </message>
     <message>
         <source>&amp;Standard</source>
-        <translation>&amp;Omissão</translation>
+        <translation type="obsolete">&amp;Omissão</translation>
     </message>
     <message>
         <source>Summation</source>
-        <translation>Somatório</translation>
+        <translation type="obsolete">Somatório</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
-        <translation>&amp;Somatório</translation>
+        <translation type="obsolete">&amp;Somatório</translation>
     </message>
     <message>
         <source>Absolute Value</source>
-        <translation>Valor Absoluto</translation>
+        <translation type="obsolete">Valor Absoluto</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
-        <translation>&amp;Absoluto</translation>
+        <translation type="obsolete">&amp;Absoluto</translation>
     </message>
     <message>
         <source>Sine</source>
-        <translation>Seno</translation>
+        <translation type="obsolete">Seno</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
-        <translation>Se&amp;no</translation>
+        <translation type="obsolete">Se&amp;no</translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation>Arc-Seno</translation>
+        <translation type="obsolete">Arc-Seno</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
-        <translation>A&amp;rco-Seno</translation>
+        <translation type="obsolete">A&amp;rco-Seno</translation>
     </message>
     <message>
         <source>Cosine</source>
-        <translation>Coseno</translation>
+        <translation type="obsolete">Coseno</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
-        <translation>&amp;Coseno</translation>
+        <translation type="obsolete">&amp;Coseno</translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation>Arc-Coseno</translation>
+        <translation type="obsolete">Arc-Coseno</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation>Arc-Cos&amp;eno</translation>
+        <translation type="obsolete">Arc-Cos&amp;eno</translation>
     </message>
     <message>
         <source>Tangent</source>
-        <translation>Tangente</translation>
+        <translation type="obsolete">Tangente</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
-        <translation>&amp;Tangente</translation>
+        <translation type="obsolete">&amp;Tangente</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation>Arc-Tangente</translation>
+        <translation type="obsolete">Arc-Tangente</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation>Arc-Tan&amp;gente</translation>
+        <translation type="obsolete">Arc-Tan&amp;gente</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation>Arc-Tangende das Cordenadas</translation>
+        <translation type="obsolete">Arc-Tangende das Cordenadas</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation>C&amp;oordenadas Arc-Tangente</translation>
+        <translation type="obsolete">C&amp;oordenadas Arc-Tangente</translation>
     </message>
     <message>
         <source>Exponential</source>
-        <translation>Exponencial</translation>
+        <translation type="obsolete">Exponencial</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
-        <translation>&amp;Exponencial</translation>
+        <translation type="obsolete">&amp;Exponencial</translation>
     </message>
     <message>
         <source>Logarithm</source>
-        <translation>Logaritmo</translation>
+        <translation type="obsolete">Logaritmo</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
-        <translation>&amp;Logaritmo</translation>
+        <translation type="obsolete">&amp;Logaritmo</translation>
     </message>
     <message>
         <source>Power</source>
-        <translation>Elevado</translation>
+        <translation type="obsolete">Elevado</translation>
     </message>
     <message>
         <source>&amp;Power</source>
-        <translation>&amp;Elevado</translation>
+        <translation type="obsolete">&amp;Elevado</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
-        <translation>&amp;Matemático</translation>
+        <translation type="obsolete">&amp;Matemático</translation>
     </message>
     <message>
         <source>Average</source>
-        <translation>Média</translation>
+        <translation type="obsolete">Média</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation>Medi&amp;a</translation>
+        <translation type="obsolete">Medi&amp;a</translation>
     </message>
     <message>
         <source>Maximum</source>
-        <translation>Máximo</translation>
+        <translation type="obsolete">Máximo</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
-        <translation>Má&amp;ximo</translation>
+        <translation type="obsolete">Má&amp;ximo</translation>
     </message>
     <message>
         <source>Minimum</source>
-        <translation>Mínimo</translation>
+        <translation type="obsolete">Mínimo</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
-        <translation>&amp;Mínimo</translation>
+        <translation type="obsolete">&amp;Mínimo</translation>
     </message>
     <message>
         <source>Count</source>
-        <translation>Contador</translation>
+        <translation type="obsolete">Contador</translation>
     </message>
     <message>
         <source>&amp;Count</source>
-        <translation>&amp;Contador</translation>
+        <translation type="obsolete">&amp;Contador</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
-        <translation>E&amp;statística</translation>
+        <translation type="obsolete">E&amp;statística</translation>
     </message>
     <message>
         <source>Functions</source>
@@ -719,6 +719,390 @@ Este software está licenciado sob a licença GPL. A sua distribuição é livre
 
 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>
@@ -728,7 +1112,7 @@ http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>Syntax error!</source>
-        <translation>Erro de sintaxe!</translation>
+        <translation type="obsolete">Erro de sintaxe!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
diff --git a/i18n/pt/opie-update-symlinks.ts b/i18n/pt/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/opieirc.ts b/i18n/pt/opieirc.ts
index 33682f7..6d7adc6 100644
--- a/i18n/pt/opieirc.ts
+++ b/i18n/pt/opieirc.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
@@ -58,6 +58,21 @@
     </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>
@@ -89,7 +104,7 @@
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Alteração de alcunha de um utilizador desconhecido</translation>
+        <translation type="obsolete">Alteração de alcunha de um utilizador desconhecido</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
@@ -109,7 +124,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>Recebido um VERSÃO CTCP  de</translation>
+        <translation type="obsolete">Recebido um VERSÃO CTCP  de</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -209,16 +224,113 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>A sua alcunha mudou para %1</translation>
+        <translation type="obsolete">A sua alcunha mudou para %1</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 mudou a alcunha para %2</translation>
+        <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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -315,7 +427,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>É necessária uma porta</translation>
+        <translation type="obsolete">É necessária uma porta</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -323,7 +435,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>É necessário um nome</translation>
+        <translation type="obsolete">É necessário um nome</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -377,7 +489,7 @@ nomes começam por &quot;#&quot; ou &quot;+&quot;</translation>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Ligação a</translation>
+        <translation type="obsolete">Ligação a</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -387,6 +499,25 @@ nomes começam por &quot;#&quot; ou &quot;+&quot;</translation>
         <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>
@@ -466,6 +597,14 @@ nomes começam por &quot;#&quot; ou &quot;+&quot;</translation>
         <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>
@@ -513,4 +652,31 @@ nomes começam por &quot;#&quot; ou &quot;+&quot;</translation>
         <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 242ccfc..99637a7 100644
--- a/i18n/pt/opiemail.ts
+++ b/i18n/pt/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/pt/opieplayer2.ts b/i18n/pt/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/pt/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/pt/opierec.ts b/i18n/pt/opierec.ts
index c81ea51..f84a44a 100644
--- a/i18n/pt/opierec.ts
+++ b/i18n/pt/opierec.ts
@@ -113,7 +113,7 @@ espaço livre</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>segundos</translation>
+        <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;
@@ -180,15 +180,15 @@ the selected file?</source>
     </message>
     <message>
         <source>Rec</source>
-        <translation>Gravar</translation>
+        <translation type="obsolete">Gravar</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>Localização</translation>
+        <translation type="obsolete">Localização</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
@@ -204,14 +204,18 @@ the selected file?</source>
     </message>
     <message>
         <source>Stop</source>
-        <translation>Parar</translation>
+        <translation type="obsolete">Parar</translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/opimconverter.ts b/i18n/pt/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/pt/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/osearch.ts b/i18n/pt/osearch.ts
index a13d956..a05939a 100644
--- a/i18n/pt/osearch.ts
+++ b/i18n/pt/osearch.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Sensível a letras grandes/pequenas</translation>
+        <translation type="obsolete">Sensível a letras grandes/pequenas</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -65,6 +65,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -97,15 +101,15 @@
     </message>
     <message>
         <source>show completed tasks</source>
-        <translation>mostrar tarefas completas</translation>
+        <translation type="obsolete">mostrar tarefas completas</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>mostrar eventos do passado</translation>
+        <translation type="obsolete">mostrar eventos do passado</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>procurar nas datas</translation>
+        <translation type="obsolete">procurar nas datas</translation>
     </message>
     <message>
         <source>File: </source>
@@ -121,11 +125,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>procurar conteúdo</translation>
+        <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 897c2a8..f7ff7f0 100644
--- a/i18n/pt/oxygen.ts
+++ b/i18n/pt/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>Composição Elementar (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/pt/oyatzee.ts b/i18n/pt/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/pt/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/packagemanager.ts b/i18n/pt/packagemanager.ts
index ca83859..f314a0a 100644
--- a/i18n/pt/packagemanager.ts
+++ b/i18n/pt/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -378,7 +418,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Clique aqui para actualizar a lista de pacotes dos servidores.</translation>
+        <translation type="obsolete">Clique aqui para actualizar a lista de pacotes dos servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -386,7 +426,7 @@
     </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>
+        <translation type="obsolete">Clique aqui para actualizar todos os pacotes que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -394,7 +434,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Clique aqui para obter os pacotes seleccionados.</translation>
+        <translation type="obsolete">Clique aqui para obter os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -402,7 +442,7 @@
     </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>
+        <translation type="obsolete">Clique aqui para instalar, remover ou actualizar os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -414,7 +454,7 @@
     </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>
+        <translation type="obsolete">Clique aqui para mostrar os pacotes disponíveis que não estão instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -422,7 +462,7 @@
     </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>
+        <translation type="obsolete">Clique aqui para motrar os pacotes instalados neste dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -430,7 +470,7 @@
     </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>
+        <translation type="obsolete">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>
@@ -454,7 +494,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Clique aqui para procurar pacotes por texto no nome.</translation>
+        <translation type="obsolete">Clique aqui para procurar pacotes por texto no nome.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -462,7 +502,7 @@
     </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>
+        <translation type="obsolete">Clique aqui para procurar o próximo pacote que contenha o texto que procura no nome.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -482,11 +522,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Clique aqui para configurar esta aplicação.</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Clique aqui para esconder a barra de pesquisa.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -633,84 +673,140 @@ Tem a certeza?</translation>
         <translation type="obsolete">A actualizar a lista de aplicações...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -746,23 +842,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Servidor</translation>
+        <translation type="obsolete">Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
+        <translation type="obsolete">Nome:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Endereço:</translation>
+        <translation type="obsolete">Endereço:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Servidor Activo</translation>
+        <translation type="obsolete">Servidor Activo</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Actualizar</translation>
+        <translation type="obsolete">Actualizar</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -820,6 +916,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Analisar resultado</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nome:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Localização:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nome:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Endereço:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -852,6 +1090,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/pt/powerchord.ts b/i18n/pt/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/pt/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/pt/pyquicklauncher.ts b/i18n/pt/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 391395a..c7f05a2 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -246,6 +246,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -265,6 +272,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/pt/security.ts b/i18n/pt/security.ts
index a2b43aa..333319d 100644
--- a/i18n/pt/security.ts
+++ b/i18n/pt/security.ts
@@ -70,40 +70,32 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -113,6 +105,26 @@ You can only select an actually configured user.</source>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -137,23 +149,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/sfcave.ts b/i18n/pt/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/pt/sfcave.ts
+++ b/i18n/pt/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/simple-icon.ts b/i18n/pt/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/pt/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/simple-main.ts b/i18n/pt/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/pt/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/simple-pim.ts b/i18n/pt/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/pt/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/simple.ts b/i18n/pt/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/pt/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/stocktickertest.ts b/i18n/pt/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/pt/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/sysinfo.ts b/i18n/pt/sysinfo.ts
index 39c0696..871134b 100644
--- a/i18n/pt/sysinfo.ts
+++ b/i18n/pt/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -338,6 +334,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -381,5 +381,9 @@ to this process?</source>
         <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 da22d3d..26a8119 100644
--- a/i18n/pt/tableviewer.ts
+++ b/i18n/pt/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>Não foi possível atribuir o valor por omissão para o tipo %1. A chave não foi adicionada.</translation>
+        <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>Não foi encontrado nenhum tipo válido para o comando DataElem::setField(%1, %2)</translation>
+        <translation type="obsolete">Não foi encontrado nenhum tipo válido para o comando DataElem::setField(%1, %2)</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pt/textedit.ts b/i18n/pt/textedit.ts
index 08e44c0..312cdf3 100644
--- a/i18n/pt/textedit.ts
+++ b/i18n/pt/textedit.ts
@@ -200,6 +200,10 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
         <translation>Tem a certeza que quer apagar o ficheiro do disco ?
 Esta operação é &lt;b&gt;irreversível!&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index b1b2537..09fdd71 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Hoje</translation>
+        <translation type="unfinished">Hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Não foram encontrados extras</translation>
+        <translation type="obsolete">Não foram encontrados extras</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -29,6 +29,14 @@
         <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>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index bcdda00..ccd8d99 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -9,6 +9,29 @@
         <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>
@@ -34,6 +57,17 @@
     </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>
@@ -53,46 +87,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Lista de Tarefas do Opie</translation>
+        <translation type="obsolete">Lista de Tarefas do Opie</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Novo a partir de exemplo</translation>
+        <translation type="obsolete">Novo a partir de exemplo</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nova Tarefa</translation>
+        <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Clique aqui para criar uma nova tarefa.</translation>
+        <translation type="obsolete">Clique aqui para criar uma nova tarefa.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Editar Tarefa</translation>
+        <translation type="obsolete">Editar Tarefa</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Clique aqui para modificar uma tarefa.</translation>
+        <translation type="obsolete">Clique aqui para modificar uma tarefa.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Ver Tarefa</translation>
+        <translation type="obsolete">Ver Tarefa</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Apagar...</translation>
+        <translation type="obsolete">Apagar...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Clique aqui para remover a tarefa actual.</translation>
+        <translation type="obsolete">Clique aqui para remover a tarefa actual.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Apagar Todas...</translation>
+        <translation type="obsolete">Apagar Todas...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,15 +134,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>Irradiar</translation>
+        <translation type="obsolete">Irradiar</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Clique aqui para irradiar a tarefa actual para outro dispositivo.</translation>
+        <translation type="obsolete">Clique aqui para irradiar a tarefa actual para outro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Procurar</translation>
+        <translation type="obsolete">Procurar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -128,15 +162,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Dados</translation>
+        <translation type="obsolete">Dados</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Categoria</translation>
+        <translation type="obsolete">Categoria</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opções</translation>
+        <translation type="obsolete">Opções</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -160,7 +194,7 @@ Esta lista mostra a seguinte informação:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Todas as Categorias</translation>
+        <translation type="obsolete">Todas as Categorias</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -198,7 +232,7 @@ Sair na mesma?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Vazio</translation>
+        <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>
@@ -210,7 +244,7 @@ Sair na mesma?</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplicar</translation>
+        <translation type="obsolete">Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
@@ -230,7 +264,7 @@ Sair na mesma?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Configurar Exemplos</translation>
+        <translation type="obsolete">Configurar Exemplos</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/pt/wellenreiter.ts b/i18n/pt/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/pt/wellenreiter.ts
+++ b/i18n/pt/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/pt/zlines.ts b/i18n/pt/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/pt/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/zsafe.ts b/i18n/pt/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/pt/zsafe.ts
+++ b/i18n/pt/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/zsame.ts b/i18n/pt/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/pt/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index 56d71df..ab75cb0 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Este diretório não existe</translation>
+        <translation type="obsolete">Este diretório não existe</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -140,19 +140,19 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Não pude copiar
+        <translation type="obsolete">Não pude copiar
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>para
+        <translation type="obsolete">para
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Não pude mover
+        <translation type="obsolete">Não pude mover
 </translation>
     </message>
     <message>
@@ -170,7 +170,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Realmente remover
+        <translation type="obsolete">Realmente remover
 %1 arquivos?</translation>
     </message>
     <message>
@@ -180,7 +180,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Copiar realmente
+        <translation type="obsolete">Copiar realmente
 %1 arquivos?</translation>
     </message>
     <message>
@@ -190,29 +190,29 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 existe. Sobrescreve ?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>já existe.
+        <translation type="obsolete">já existe.
 Você realmente deseja remover?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 existe. Sobrescreve ?</translation>
+        <translation type="obsolete">%1 existe. Sobrescreve ?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Impossível copiar %1 para %2</translation>
+        <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>Gereciador de Arquivo Avançado
+        <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>
@@ -233,7 +233,7 @@ e é licenciado sob a GPL</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Impossível remover diretório atual
+        <translation type="obsolete">Impossível remover diretório atual
 dos marcadores.
 Ele não está nos marcadores!</translation>
     </message>
@@ -244,13 +244,13 @@ Ele não está nos marcadores!</translation>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Remove mesmo %1
+        <translation type="obsolete">Remove mesmo %1
 e todo seu conteúdo?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Remove mesmo
+        <translation type="obsolete">Remove mesmo
 %1?</translation>
     </message>
     <message>
@@ -286,11 +286,75 @@ e todo seu conteúdo?</translation>
 %1 
 to 
 %2</source>
-        <translation>Impossível copiar 
+        <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>
diff --git a/i18n/pt_BR/backup.ts b/i18n/pt_BR/backup.ts
index 25f4bf6..06c9bc8 100644
--- a/i18n/pt_BR/backup.ts
+++ b/i18n/pt_BR/backup.ts
@@ -2,10 +2,6 @@
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54,6 +50,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -70,10 +74,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,6 +113,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/pt_BR/bartender.ts b/i18n/pt_BR/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/pt_BR/bartender.ts
+++ b/i18n/pt_BR/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/pt_BR/bluetooth-manager.ts b/i18n/pt_BR/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/pt_BR/bluetooth-manager.ts
+++ b/i18n/pt_BR/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/pt_BR/dagger.ts b/i18n/pt_BR/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/pt_BR/dagger.ts
+++ b/i18n/pt_BR/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/pt_BR/launchersettings.ts b/i18n/pt_BR/launchersettings.ts
index b54452f..679868d 100644
--- a/i18n/pt_BR/launchersettings.ts
+++ b/i18n/pt_BR/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/pt_BR/libGPRS.ts b/i18n/pt_BR/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/pt_BR/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libaboutapplet.ts b/i18n/pt_BR/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/pt_BR/libaboutapplet.ts
+++ b/i18n/pt_BR/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libbatteryapplet.ts b/i18n/pt_BR/libbatteryapplet.ts
index fc21e4e..e6a8337 100644
--- a/i18n/pt_BR/libbatteryapplet.ts
+++ b/i18n/pt_BR/libbatteryapplet.ts
@@ -24,7 +24,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Porcentagem de bateria restante</translation>
+        <translation type="obsolete">Porcentagem de bateria restante</translation>
     </message>
     <message>
         <source>Power on-line</source>
@@ -36,7 +36,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Tempo restante de bateria</translation>
+        <translation type="obsolete">Tempo restante de bateria</translation>
     </message>
     <message>
         <source>Critical</source>
@@ -72,11 +72,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Porcentagem de bateria restante:</translation>
+        <translation type="obsolete">Porcentagem de bateria restante:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Tempo restante de bateria:</translation>
+        <translation type="obsolete">Tempo restante de bateria:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -88,11 +88,28 @@
     </message>
     <message>
         <source>Ipaq  </source>
-        <translation>Ipaq  </translation>
+        <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/libbluetooth.ts b/i18n/pt_BR/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/pt_BR/libbluetooth.ts
+++ b/i18n/pt_BR/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libbrightnessapplet.ts b/i18n/pt_BR/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libcable.ts b/i18n/pt_BR/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/pt_BR/libcable.ts
+++ b/i18n/pt_BR/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/libcardmonapplet.ts b/i18n/pt_BR/libcardmonapplet.ts
index f8634c6..f7c070b 100644
--- a/i18n/pt_BR/libcardmonapplet.ts
+++ b/i18n/pt_BR/libcardmonapplet.ts
@@ -30,5 +30,13 @@
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libexample_applet.ts b/i18n/pt_BR/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/pt_BR/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libexample_board.ts b/i18n/pt_BR/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/pt_BR/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libexample_vpn.ts b/i18n/pt_BR/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/pt_BR/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libinterfaces.ts b/i18n/pt_BR/libinterfaces.ts
index 8239ed9..080cc89 100644
--- a/i18n/pt_BR/libinterfaces.ts
+++ b/i18n/pt_BR/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/pt_BR/libkppp.ts b/i18n/pt_BR/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/pt_BR/libkppp.ts
+++ b/i18n/pt_BR/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/pt_BR/liblancard.ts b/i18n/pt_BR/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/pt_BR/liblancard.ts
+++ b/i18n/pt_BR/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/liblockapplet.ts b/i18n/pt_BR/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/pt_BR/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libmailwrapper.ts b/i18n/pt_BR/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/pt_BR/libmailwrapper.ts
+++ b/i18n/pt_BR/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/pt_BR/libmemoryapplet.ts b/i18n/pt_BR/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/pt_BR/libmemoryapplet.ts
+++ b/i18n/pt_BR/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/pt_BR/libnetworksettings2.ts b/i18n/pt_BR/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/pt_BR/libnetworksettings2.ts
+++ b/i18n/pt_BR/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/libopiemm2.ts b/i18n/pt_BR/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/pt_BR/libopiemm2.ts
+++ b/i18n/pt_BR/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libopiepim2.ts b/i18n/pt_BR/libopiepim2.ts
index a32db17..6e7133c 100644
--- a/i18n/pt_BR/libopiepim2.ts
+++ b/i18n/pt_BR/libopiepim2.ts
@@ -599,6 +599,109 @@ e</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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1038,6 +1141,34 @@ e</translation>
         <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>
diff --git a/i18n/pt_BR/libopiesecurity2.ts b/i18n/pt_BR/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/pt_BR/libopiesecurity2.ts
+++ b/i18n/pt_BR/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/libopietooth2.ts b/i18n/pt_BR/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/pt_BR/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libopietooth2applet.ts b/i18n/pt_BR/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/pt_BR/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libopieui2.ts b/i18n/pt_BR/libopieui2.ts
index 69234ab..292d2da 100644
--- a/i18n/pt_BR/libopieui2.ts
+++ b/i18n/pt_BR/libopieui2.ts
@@ -112,19 +112,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">DiálogoArquivo</translation>
+        <translation type="obsolete">DiálogoArquivo</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Abrir</translation>
+        <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Salvar</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Salvar</translation>
     </message>
 </context>
 <context>
@@ -172,15 +168,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Tamanho</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
@@ -450,15 +446,19 @@ e</translation>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">DiálogoArquivo</translation>
+        <translation type="unfinished">DiálogoArquivo</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Salvar</translation>
+        <translation type="unfinished">Salvar</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -472,15 +472,15 @@ e</translation>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
+        <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pt_BR/libphasestyle.ts b/i18n/pt_BR/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/pt_BR/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libppp.ts b/i18n/pt_BR/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/pt_BR/libppp.ts
+++ b/i18n/pt_BR/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/pt_BR/libprofile.ts b/i18n/pt_BR/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/pt_BR/libprofile.ts
+++ b/i18n/pt_BR/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/pt_BR/libqpickboard.ts b/i18n/pt_BR/libqpickboard.ts
index 4c83d79..969f7f5 100644
--- a/i18n/pt_BR/libqpickboard.ts
+++ b/i18n/pt_BR/libqpickboard.ts
@@ -1,10 +1,90 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libscreenshotapplet.ts b/i18n/pt_BR/libscreenshotapplet.ts
index 586e128..6e0d2e6 100644
--- a/i18n/pt_BR/libscreenshotapplet.ts
+++ b/i18n/pt_BR/libscreenshotapplet.ts
@@ -46,5 +46,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libtodayaddressbookplugin.ts b/i18n/pt_BR/libtodayaddressbookplugin.ts
index ea68edf..1d2a0d8 100644
--- a/i18n/pt_BR/libtodayaddressbookplugin.ts
+++ b/i18n/pt_BR/libtodayaddressbookplugin.ts
@@ -10,14 +10,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,10 +51,6 @@ Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pt_BR/libtodayexampleplugin.ts b/i18n/pt_BR/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/pt_BR/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libtodayweatherplugin.ts b/i18n/pt_BR/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/pt_BR/libtodayweatherplugin.ts
+++ b/i18n/pt_BR/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/libvolumeapplet2.ts b/i18n/pt_BR/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libvpn.ts b/i18n/pt_BR/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/pt_BR/libvpn.ts
+++ b/i18n/pt_BR/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/libwebstyle.ts b/i18n/pt_BR/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/pt_BR/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libwlan.ts b/i18n/pt_BR/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/pt_BR/libwlan.ts
+++ b/i18n/pt_BR/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/pt_BR/main-tab.ts b/i18n/pt_BR/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/pt_BR/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/multiauth.ts b/i18n/pt_BR/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/networksettings2.ts b/i18n/pt_BR/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/pt_BR/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/opie-console.ts b/i18n/pt_BR/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/pt_BR/opie-console.ts
+++ b/i18n/pt_BR/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pt_BR/opie-eye.ts b/i18n/pt_BR/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/pt_BR/opie-eye.ts
+++ b/i18n/pt_BR/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/opie-eye_slave.ts b/i18n/pt_BR/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/pt_BR/opie-eye_slave.ts
+++ b/i18n/pt_BR/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/opie-login.ts b/i18n/pt_BR/opie-login.ts
index 0ce0332..cb42a27 100644
--- a/i18n/pt_BR/opie-login.ts
+++ b/i18n/pt_BR/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -75,8 +71,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/pt_BR/opie-sheet.ts b/i18n/pt_BR/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/pt_BR/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/opie-update-symlinks.ts b/i18n/pt_BR/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/opieirc.ts b/i18n/pt_BR/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/pt_BR/opieirc.ts
+++ b/i18n/pt_BR/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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_BR/opiemail.ts b/i18n/pt_BR/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/pt_BR/opiemail.ts
+++ b/i18n/pt_BR/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/pt_BR/opieplayer2.ts b/i18n/pt_BR/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/pt_BR/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/pt_BR/opierec.ts b/i18n/pt_BR/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/pt_BR/opierec.ts
+++ b/i18n/pt_BR/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/opimconverter.ts b/i18n/pt_BR/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/pt_BR/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/osearch.ts b/i18n/pt_BR/osearch.ts
index e20a0f4..97ed663 100644
--- a/i18n/pt_BR/osearch.ts
+++ b/i18n/pt_BR/osearch.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -96,35 +96,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show completed tasks</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/oxygen.ts b/i18n/pt_BR/oxygen.ts
index 95ea62e..8a90e8e 100644
--- a/i18n/pt_BR/oxygen.ts
+++ b/i18n/pt_BR/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/pt_BR/oyatzee.ts b/i18n/pt_BR/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/pt_BR/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/packagemanager.ts b/i18n/pt_BR/packagemanager.ts
index f6ddc91..d86ecec 100644
--- a/i18n/pt_BR/packagemanager.ts
+++ b/i18n/pt_BR/packagemanager.ts
@@ -1,11 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
-    <name>DataManager</name>
-</context>
-<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
@@ -47,9 +41,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InputDialog</name>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallDlg</name>
@@ -128,15 +159,6 @@
     </message>
 </context>
 <context>
-    <name>InstallDlgImpl</name>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-</context>
-<context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
@@ -147,119 +169,123 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
+        <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade</source>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
+        <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply changes</source>
+        <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show packages not installed</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show installed packages</source>
+        <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show updated packages</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Packages</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -269,78 +295,86 @@ A blue dot next to the package name indicates that the package is currently inst
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -375,79 +409,201 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Depends</source>
+        <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Reinstall</source>
+        <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Remove</source>
+        <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Overwrite</source>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Errors only</source>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal messages</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Informative messages</source>
+        <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Troubleshooting output</source>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -482,17 +638,17 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-</context>
-<context>
-    <name>QObject</name>
-</context>
-<context>
-    <name>QuestionDlg</name>
-</context>
-<context>
-    <name>SettingsImpl</name>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/powerchord.ts b/i18n/pt_BR/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/pt_BR/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/pt_BR/pyquicklauncher.ts b/i18n/pt_BR/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index 15dd221..330d9e2 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -243,6 +243,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -262,6 +269,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/pt_BR/security.ts b/i18n/pt_BR/security.ts
index e7b589f..3a307c6 100644
--- a/i18n/pt_BR/security.ts
+++ b/i18n/pt_BR/security.ts
@@ -71,49 +71,37 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <source>Any</source>
+        <translation type="unfinished">Qualquer</translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
+        <source>None</source>
+        <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
-        <source>192.168.1.0/24</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>OK</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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -138,23 +126,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Testing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/sfcave.ts b/i18n/pt_BR/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/pt_BR/sfcave.ts
+++ b/i18n/pt_BR/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/simple-icon.ts b/i18n/pt_BR/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/pt_BR/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/simple-main.ts b/i18n/pt_BR/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/pt_BR/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/simple-pim.ts b/i18n/pt_BR/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/pt_BR/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/simple.ts b/i18n/pt_BR/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/pt_BR/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/stocktickertest.ts b/i18n/pt_BR/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/pt_BR/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/sysinfo.ts b/i18n/pt_BR/sysinfo.ts
index 8968599..494101e 100644
--- a/i18n/pt_BR/sysinfo.ts
+++ b/i18n/pt_BR/sysinfo.ts
@@ -62,10 +62,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -311,6 +307,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -346,5 +346,9 @@ to this process?</source>
         <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_BR/tableviewer.ts b/i18n/pt_BR/tableviewer.ts
index 907d602..2dc3220 100644
--- a/i18n/pt_BR/tableviewer.ts
+++ b/i18n/pt_BR/tableviewer.ts
@@ -1,17 +1,6 @@
 <!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="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>key</source>
diff --git a/i18n/pt_BR/textedit.ts b/i18n/pt_BR/textedit.ts
index 9f6cfb9..df242ef 100644
--- a/i18n/pt_BR/textedit.ts
+++ b/i18n/pt_BR/textedit.ts
@@ -203,6 +203,10 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
 &lt;B&gt;remover&lt;/B&gt; o arquivo atual
 do disco?&lt;BR&gt;Isto é &lt;B&gt;irreversível!&lt;/B&gt;</translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/pt_BR/today.ts b/i18n/pt_BR/today.ts
index 24a7033..2c79be2 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -4,7 +4,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Hoje</translation>
+        <translation type="unfinished">Hoje</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
@@ -12,7 +12,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Nenhum Plugin encontrado</translation>
+        <translation type="obsolete">Nenhum Plugin encontrado</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -26,6 +26,14 @@
         <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>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index 0d3583a..d2486cc 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -10,6 +10,29 @@
         <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>
@@ -35,6 +58,17 @@
     </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>
@@ -54,46 +88,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Opie Lista de Tarefas</translation>
+        <translation type="obsolete">Opie Lista de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Novo apartir do modelo</translation>
+        <translation type="obsolete">Novo apartir do modelo</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nova Tarefa</translation>
+        <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Clique aqui para criar nova tarefa.</translation>
+        <translation type="obsolete">Clique aqui para criar nova tarefa.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Editar Tarefa</translation>
+        <translation type="obsolete">Editar Tarefa</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Clique aqui para alterar a recursão da tarefa.</translation>
+        <translation type="obsolete">Clique aqui para alterar a recursão da tarefa.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Ver Tarefa</translation>
+        <translation type="obsolete">Ver Tarefa</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Apagar...</translation>
+        <translation type="obsolete">Apagar...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Clique aqui para remover a tarefa atual.</translation>
+        <translation type="obsolete">Clique aqui para remover a tarefa atual.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Apagar tudo...</translation>
+        <translation type="obsolete">Apagar tudo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -101,15 +135,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>Enviar</translation>
+        <translation type="obsolete">Enviar</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Clique aqui para enviar a tarefa atual para outro dispositivo.</translation>
+        <translation type="obsolete">Clique aqui para enviar a tarefa atual para outro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Localizar</translation>
+        <translation type="obsolete">Localizar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -129,15 +163,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Dados</translation>
+        <translation type="obsolete">Dados</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Categoria</translation>
+        <translation type="obsolete">Categoria</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opções</translation>
+        <translation type="obsolete">Opções</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -161,7 +195,7 @@ A lista mostra as seguintes informações:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Todas as Categorias</translation>
+        <translation type="obsolete">Todas as Categorias</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -199,7 +233,7 @@ Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Não preenchido</translation>
+        <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>
@@ -211,7 +245,7 @@ Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplicar</translation>
+        <translation type="obsolete">Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
@@ -231,7 +265,7 @@ Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Configurar Modelos</translation>
+        <translation type="obsolete">Configurar Modelos</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/pt_BR/wellenreiter.ts b/i18n/pt_BR/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/pt_BR/wellenreiter.ts
+++ b/i18n/pt_BR/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/pt_BR/zlines.ts b/i18n/pt_BR/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/pt_BR/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/zsafe.ts b/i18n/pt_BR/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/pt_BR/zsafe.ts
+++ b/i18n/pt_BR/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/zsame.ts b/i18n/pt_BR/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/pt_BR/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/advancedfm.ts b/i18n/ru/advancedfm.ts
index bc5942c..9827a3c 100644
--- a/i18n/ru/advancedfm.ts
+++ b/i18n/ru/advancedfm.ts
@@ -79,7 +79,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Каталог не существует</translation>
+        <translation type="obsolete">Каталог не существует</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -148,18 +148,18 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Не могу скопировать
+        <translation type="obsolete">Не могу скопировать
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>в</translation>
+        <translation type="obsolete">в</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Не могу переместить
+        <translation type="obsolete">Не могу переместить
 </translation>
     </message>
     <message>
@@ -177,7 +177,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Действительно удалить
+        <translation type="obsolete">Действительно удалить
 %1 файлы?</translation>
     </message>
     <message>
@@ -187,7 +187,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Действительно скопировать
+        <translation type="obsolete">Действительно скопировать
 %1 файлы?</translation>
     </message>
     <message>
@@ -197,29 +197,29 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 существует. Перезаписать?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>уже существует.
+        <translation type="obsolete">уже существует.
 Вы действительно хотите удалить?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 существует. Перезаписать?</translation>
+        <translation type="obsolete">%1 существует. Перезаписать?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Не могу скопировать %1 в %2</translation>
+        <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>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 Копирайт 2002-2003
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 лицензирован на условиях GPL</translation>
@@ -240,7 +240,7 @@ L.J.Potter&lt;llornkcor@handhelds.org&gt;
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Не могу убрать каталог
+        <translation type="obsolete">Не могу убрать каталог
 из закладок.
 Он не заложен!
 
@@ -253,13 +253,13 @@ It is not bookmarked!</source>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Действительно удалить %1
+        <translation type="obsolete">Действительно удалить %1
 и все содержимые ?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Действительно удалить
+        <translation type="obsolete">Действительно удалить
 %1?</translation>
     </message>
     <message>
@@ -291,7 +291,7 @@ and all it&apos;s contents ?</source>
 %1 
 to 
 %2</source>
-        <translation>Не могу скопировать 
+        <translation type="obsolete">Не могу скопировать 
 %1 
 в 
 %2</translation>
@@ -300,6 +300,70 @@ to
         <source>Not Yet Implemented</source>
         <translation>Еще не сделано</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>
diff --git a/i18n/ru/backup.ts b/i18n/ru/backup.ts
index dfc3708..8003a1f 100644
--- a/i18n/ru/backup.ts
+++ b/i18n/ru/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Резервное копирование... в процессе...</translation>
+        <translation type="obsolete">Резервное копирование... в процессе...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -62,6 +62,14 @@
         <source>Restore Successful.</source>
         <translation>Восстановили успешно.</translation>
     </message>
+    <message>
+        <source>Backing up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Backup...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -79,7 +87,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Записать на</translation>
+        <translation type="obsolete">Записать на</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -125,6 +133,22 @@
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/ru/bartender.ts b/i18n/ru/bartender.ts
index 0092818..82a10f6 100644
--- a/i18n/ru/bartender.ts
+++ b/i18n/ru/bartender.ts
@@ -90,7 +90,7 @@
     </message>
     <message>
         <source>Find by Alcohol</source>
-        <translation>Искать по уровню алкоголя</translation>
+        <translation type="obsolete">Искать по уровню алкоголя</translation>
     </message>
     <message>
         <source>Edit</source>
@@ -98,7 +98,7 @@
     </message>
     <message>
         <source>edit</source>
-        <translation>правка</translation>
+        <translation type="obsolete">правка</translation>
     </message>
     <message>
         <source>New</source>
@@ -138,7 +138,7 @@
     </message>
     <message>
         <source>Alcohol</source>
-        <translation>Уровень алкоголя</translation>
+        <translation type="obsolete">Уровень алкоголя</translation>
     </message>
     <message>
         <source>Search</source>
@@ -150,6 +150,23 @@
         <translation>Извините, ничего не найдено по
 </translation>
     </message>
+    <message>
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/ru/bluetooth-manager.ts b/i18n/ru/bluetooth-manager.ts
index 43e7d9f..115be92 100644
--- a/i18n/ru/bluetooth-manager.ts
+++ b/i18n/ru/bluetooth-manager.ts
@@ -90,7 +90,7 @@
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
-        <translation>Основные настройки Bluetooth</translation>
+        <translation type="obsolete">Основные настройки Bluetooth</translation>
     </message>
     <message>
         <source>Default Passkey</source>
@@ -128,6 +128,10 @@
         <source>Status Label</source>
         <translation>Метка статуса</translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/ru/dagger.ts b/i18n/ru/dagger.ts
index 43261fb..deae244 100644
--- a/i18n/ru/dagger.ts
+++ b/i18n/ru/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation>Вид</translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/ru/gutenbrowser.ts b/i18n/ru/gutenbrowser.ts
index 3f1dc9d..bd0aa99 100644
--- a/i18n/ru/gutenbrowser.ts
+++ b/i18n/ru/gutenbrowser.ts
@@ -289,7 +289,7 @@ http://www.trolltech.com
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
@@ -313,6 +313,10 @@ http://www.trolltech.com
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
+    <message>
+        <source>   </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
diff --git a/i18n/ru/kpacman.ts b/i18n/ru/kpacman.ts
index 25c88e6..777059d 100644
--- a/i18n/ru/kpacman.ts
+++ b/i18n/ru/kpacman.ts
@@ -223,7 +223,11 @@ or is of an unknown format.</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/i18n/ru/launchersettings.ts b/i18n/ru/launchersettings.ts
index 51ffd4c..7e5beb1 100644
--- a/i18n/ru/launchersettings.ts
+++ b/i18n/ru/launchersettings.ts
@@ -180,6 +180,14 @@
         <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>
diff --git a/i18n/ru/libGPRS.ts b/i18n/ru/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/ru/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libaboutapplet.ts b/i18n/ru/libaboutapplet.ts
index 034f695..f81c992 100644
--- a/i18n/ru/libaboutapplet.ts
+++ b/i18n/ru/libaboutapplet.ts
@@ -14,7 +14,7 @@
     <name>AboutDialog</name>
     <message>
         <source>About</source>
-        <translation>О программе</translation>
+        <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>
@@ -42,7 +42,7 @@ Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds
     </message>
     <message>
         <source>Authors</source>
-        <translation>Авторы</translation>
+        <translation type="obsolete">Авторы</translation>
     </message>
     <message>
         <source>&lt;p&gt;
@@ -68,7 +68,7 @@ Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds
     </message>
     <message>
         <source>Report</source>
-        <translation>Сообщить</translation>
+        <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;
@@ -81,7 +81,7 @@ Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds
     </message>
     <message>
         <source>Join</source>
-        <translation>Присоединяйтесь</translation>
+        <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;
@@ -105,7 +105,7 @@ No single group, company or organization controls the Opie source code. Everyone
 &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;
+        <translation type="obsolete">&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; написан и поддерживается командой Opie, всемирной сетью разработчиков, преданных созданию свободного программного обеспечения.
 &lt;/p&gt;
 &lt;p&gt;
@@ -119,7 +119,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <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;
+        <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>
@@ -127,13 +127,72 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <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;
+        <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>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</translation>
+        <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 type="unfinished">О программе</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="unfinished">&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">&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 type="unfinished">Авторы</translation>
     </message>
     <message>
         <source>&lt;p&gt;
@@ -147,7 +206,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &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;
+        <translation type="unfinished">&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;
@@ -159,5 +218,29 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &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="unfinished">Сообщить</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;Программное обеспечение всегда можно улучшить, и команда 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 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">&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>
 </context>
 </TS>
diff --git a/i18n/ru/libbatteryapplet.ts b/i18n/ru/libbatteryapplet.ts
index 6ba7f42..da097c4 100644
--- a/i18n/ru/libbatteryapplet.ts
+++ b/i18n/ru/libbatteryapplet.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Остался процент заряда</translation>
+        <translation type="obsolete">Остался процент заряда</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Осталось времени на заряде</translation>
+        <translation type="obsolete">Осталось времени на заряде</translation>
     </message>
     <message>
         <source>Battery status</source>
@@ -71,11 +71,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Остался процент заряда:</translation>
+        <translation type="obsolete">Остался процент заряда:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Осталось времени на заряде:</translation>
+        <translation type="obsolete">Осталось времени на заряде:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -87,11 +87,28 @@
     </message>
     <message>
         <source>Ipaq  </source>
-        <translation>Ipaq  </translation>
+        <translation type="obsolete">Ipaq  </translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation>Куртка  </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/ru/libbluetooth.ts b/i18n/ru/libbluetooth.ts
index 07f60a8..b5525a8 100644
--- a/i18n/ru/libbluetooth.ts
+++ b/i18n/ru/libbluetooth.ts
@@ -52,15 +52,35 @@
     </message>
     <message>
         <source>Description</source>
-        <translation>Описание</translation>
+        <translation type="obsolete">Описание</translation>
     </message>
     <message>
         <source>Start automatically</source>
-        <translation>Запускать автоматически</translation>
+        <translation type="obsolete">Запускать автоматически</translation>
     </message>
     <message>
         <source>Confirm before start</source>
-        <translation>Подтвердить перед запуском</translation>
+        <translation type="obsolete">Подтвердить перед запуском</translation>
+    </message>
+    <message>
+        <source>Selected devices with gprs capability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -74,4 +94,11 @@
         <translation>&lt;p&gt;Устанавливает связь с использованием bluetooth последовательного профиля.&lt;/p&gt;&lt;p&gt;Используйте для связи с GSM.&lt;/p&gt;</translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ru/libbrightnessapplet.ts b/i18n/ru/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ru/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ru/libcable.ts b/i18n/ru/libcable.ts
index a432809..6191d5b 100644
--- a/i18n/ru/libcable.ts
+++ b/i18n/ru/libcable.ts
@@ -157,11 +157,15 @@
     <name>CableNetNode</name>
     <message>
         <source>Cable Connection</source>
-        <translation>Кабельное соединение</translation>
+        <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 type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/libcardmonapplet.ts b/i18n/ru/libcardmonapplet.ts
index cede30e..8210d62 100644
--- a/i18n/ru/libcardmonapplet.ts
+++ b/i18n/ru/libcardmonapplet.ts
@@ -31,11 +31,11 @@
     </message>
     <message>
         <source>New card: SD/MMC</source>
-        <translation type="obsolete">Новая карта: SD/MMC</translation>
+        <translation type="unfinished">Новая карта: SD/MMC</translation>
     </message>
     <message>
         <source>Ejected: SD/MMC</source>
-        <translation type="obsolete">Выдвинута: SD/MMC</translation>
+        <translation type="unfinished">Выдвинута: SD/MMC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libexample_applet.ts b/i18n/ru/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/ru/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libexample_board.ts b/i18n/ru/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/ru/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libexample_vpn.ts b/i18n/ru/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/ru/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libinterfaces.ts b/i18n/ru/libinterfaces.ts
index a83aa8f..36a8dc6 100644
--- a/i18n/ru/libinterfaces.ts
+++ b/i18n/ru/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Перезапускаю интерфейс</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/ru/libkppp.ts b/i18n/ru/libkppp.ts
index fc065a1..8fb5f48 100644
--- a/i18n/ru/libkppp.ts
+++ b/i18n/ru/libkppp.ts
@@ -389,6 +389,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation>Вы должны ввести уникальное имя устройства</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/ru/liblancard.ts b/i18n/ru/liblancard.ts
index 02405f4..48faca4 100644
--- a/i18n/ru/liblancard.ts
+++ b/i18n/ru/liblancard.ts
@@ -37,4 +37,11 @@
         <translation>&lt;p&gt;Настраивает обычные сетевые карты.&lt;/p&gt;&lt;p&gt;Используйте для настройки 10/100/1000 МБит/с сетевых карт.&lt;/p&gt;</translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ru/libliquid.ts b/i18n/ru/libliquid.ts
index 1f43aff..d87ecd6 100644
--- a/i18n/ru/libliquid.ts
+++ b/i18n/ru/libliquid.ts
@@ -10,66 +10,66 @@
     <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">Стиль High Performance Liquid, сделал Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/liblockapplet.ts b/i18n/ru/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/ru/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libmailwrapper.ts b/i18n/ru/libmailwrapper.ts
index cd82e8e..b3417b9 100644
--- a/i18n/ru/libmailwrapper.ts
+++ b/i18n/ru/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation>Ошибка удаления почты %1</translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/ru/libmemoryapplet.ts b/i18n/ru/libmemoryapplet.ts
index c180f74..d89e3a3 100644
--- a/i18n/ru/libmemoryapplet.ts
+++ b/i18n/ru/libmemoryapplet.ts
@@ -124,7 +124,7 @@ Memory is categorized as follows:
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation>2, 4, 6, 8 Мбайт</translation>
+        <translation type="obsolete">2, 4, 6, 8 Мбайт</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
@@ -162,5 +162,9 @@ Memory is categorized as follows:
         <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/ru/libnetworksettings2.ts b/i18n/ru/libnetworksettings2.ts
index 346642c..aa45543 100644
--- a/i18n/ru/libnetworksettings2.ts
+++ b/i18n/ru/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation>Команда :</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>
@@ -34,11 +42,35 @@
     </message>
     <message>
         <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ноды, которые обеспечивают рабочие IP соединения&lt;/p&gt;</translation>
+        <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>&lt;p&gt;Полностью настроенный профиль соединения&lt;/p&gt;</translation>
+        <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 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>
@@ -57,7 +89,7 @@
     </message>
     <message>
         <source>Off</source>
-        <translation>Отключен</translation>
+        <translation type="obsolete">Отключен</translation>
     </message>
     <message>
         <source>Available</source>
@@ -65,7 +97,15 @@
     </message>
     <message>
         <source>IsUp</source>
-        <translation>Включен</translation>
+        <translation type="obsolete">Включен</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/ru/libopiemm2.ts b/i18n/ru/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/ru/libopiemm2.ts
+++ b/i18n/ru/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ru/libopiepim2.ts b/i18n/ru/libopiepim2.ts
index 8134816..df7ee7d 100644
--- a/i18n/ru/libopiepim2.ts
+++ b/i18n/ru/libopiepim2.ts
@@ -589,6 +589,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1028,6 +1131,34 @@ and </source>
         <source>Notes</source>
         <translation>Заметки</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>
diff --git a/i18n/ru/libopiesecurity2.ts b/i18n/ru/libopiesecurity2.ts
index 21c0a4e..719026a 100644
--- a/i18n/ru/libopiesecurity2.ts
+++ b/i18n/ru/libopiesecurity2.ts
@@ -34,7 +34,7 @@
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
         <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation>Добро пожаловать в систему методов аутентификации Opie</translation>
+        <translation type="obsolete">Добро пожаловать в систему методов аутентификации Opie</translation>
     </message>
     <message>
         <source>Launching authentication plugins...</source>
@@ -46,7 +46,7 @@
     </message>
     <message>
         <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation>Примечание: кнопку &apos;выйти&apos; следует удалить для реальной защиты, через диалог настроек Безопасности</translation>
+        <translation type="obsolete">Примечание: кнопку &apos;выйти&apos; следует удалить для реальной защиты, через диалог настроек Безопасности</translation>
     </message>
     <message>
         <source>Congratulations! Your authentication has been successful.</source>
@@ -54,11 +54,27 @@
     </message>
     <message>
         <source>You have not succeeded enough authentication steps!</source>
-        <translation>Вы не прошли процесс аутентификации!</translation>
+        <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>Примечание: если опция &apos;разрешить пропуск&apos; была отключена в настройках Безопасности, вам придется начать сначала.</translation>
+        <translation type="obsolete">Примечание: если опция &apos;разрешить пропуск&apos; была отключена в настройках Безопасности, вам придется начать сначала.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/i18n/ru/libopietooth2.ts b/i18n/ru/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/ru/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libopietooth2applet.ts b/i18n/ru/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/ru/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libopieui2.ts b/i18n/ru/libopieui2.ts
index 2272924..00f923c 100644
--- a/i18n/ru/libopieui2.ts
+++ b/i18n/ru/libopieui2.ts
@@ -116,19 +116,19 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>ФайлДиалог</translation>
+        <translation type="obsolete">ФайлДиалог</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Открыть</translation>
+        <translation type="obsolete">Открыть</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Сохранить</translation>
+        <translation type="obsolete">Сохранить</translation>
     </message>
     <message>
         <source>Select Directory</source>
-        <translation>Выбрать каталог</translation>
+        <translation type="obsolete">Выбрать каталог</translation>
     </message>
 </context>
 <context>
@@ -176,15 +176,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Стиль</translation>
+        <translation type="obsolete">Стиль</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Размер</translation>
+        <translation type="obsolete">Размер</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
+        <translation type="obsolete">А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
     </message>
 </context>
 <context>
@@ -500,19 +500,19 @@ and </source>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">ФайлДиалог</translation>
+        <translation type="unfinished">ФайлДиалог</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Открыть</translation>
+        <translation type="unfinished">Открыть</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Сохранить</translation>
+        <translation type="unfinished">Сохранить</translation>
     </message>
     <message>
         <source>Select Directory</source>
-        <translation type="obsolete">Выбрать каталог</translation>
+        <translation type="unfinished">Выбрать каталог</translation>
     </message>
 </context>
 <context>
@@ -526,15 +526,15 @@ and </source>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Стиль</translation>
+        <translation type="unfinished">Стиль</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Размер</translation>
+        <translation type="unfinished">Размер</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
+        <translation type="unfinished">А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/ru/libphasestyle.ts b/i18n/ru/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/ru/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libppp.ts b/i18n/ru/libppp.ts
index 7c1c6f7..911ba3d 100644
--- a/i18n/ru/libppp.ts
+++ b/i18n/ru/libppp.ts
@@ -124,6 +124,45 @@
     </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>
@@ -141,24 +180,32 @@
         <source>DNS Settings</source>
         <translation>Настройки DNS</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>Необходим IP адрес</translation>
+        <translation type="obsolete">Необходим IP адрес</translation>
     </message>
     <message>
         <source>IPAddress not valid</source>
-        <translation>IP адрес неверен</translation>
+        <translation type="obsolete">IP адрес неверен</translation>
     </message>
     <message>
         <source>Subnet mask needed</source>
-        <translation>Необходима маска подсети</translation>
+        <translation type="obsolete">Необходима маска подсети</translation>
     </message>
     <message>
         <source>Subnet mask not valid</source>
-        <translation>Маска подсети неверна</translation>
+        <translation type="obsolete">Маска подсети неверна</translation>
     </message>
     <message>
         <source>Gateway address needed</source>
@@ -189,7 +236,7 @@
     </message>
     <message>
         <source>Subnetmask</source>
-        <translation>Маска подсети</translation>
+        <translation type="obsolete">Маска подсети</translation>
     </message>
     <message>
         <source>Address</source>
@@ -203,16 +250,66 @@
         <source>Set as default</source>
         <translation>Установить по умолчанию</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>PPP соединение</translation>
+        <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 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/ru/libprofile.ts b/i18n/ru/libprofile.ts
index 67441c3..1fb4d1c 100644
--- a/i18n/ru/libprofile.ts
+++ b/i18n/ru/libprofile.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>Disabled</source>
-        <translation>Запрещен</translation>
+        <translation type="obsolete">Запрещен</translation>
     </message>
     <message>
         <source>Trigger VPN</source>
@@ -111,11 +111,11 @@
     </message>
     <message>
         <source>Transmitting</source>
-        <translation>Исходящий</translation>
+        <translation type="obsolete">Исходящий</translation>
     </message>
     <message>
         <source>Others</source>
-        <translation>Прочие</translation>
+        <translation type="obsolete">Прочие</translation>
     </message>
     <message>
         <source>Collisions</source>
@@ -125,6 +125,30 @@
         <source>Live feed </source>
         <translation>Прямая передача</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>
diff --git a/i18n/ru/libqpickboard.ts b/i18n/ru/libqpickboard.ts
index 6393042..77e7c83 100644
--- a/i18n/ru/libqpickboard.ts
+++ b/i18n/ru/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Подбор клавиш</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ru/libscreenshotapplet.ts b/i18n/ru/libscreenshotapplet.ts
index a7e7b50..21bc293 100644
--- a/i18n/ru/libscreenshotapplet.ts
+++ b/i18n/ru/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation>Соединение с %1 неудалось.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/libtodayaddressbookplugin.ts b/i18n/ru/libtodayaddressbookplugin.ts
index 2e2ed10..7d15cb7 100644
--- a/i18n/ru/libtodayaddressbookplugin.ts
+++ b/i18n/ru/libtodayaddressbookplugin.ts
@@ -11,11 +11,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Обрезать после X символов:</translation>
+        <translation type="obsolete">Обрезать после X символов:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>После скольки символов данные будут обрезаны</translation>
+        <translation type="obsolete">После скольки символов данные будут обрезаны</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
@@ -61,7 +61,7 @@ Color if below </source>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Чтобы применить установки: Перезапустите приложение!</translation>
+        <translation type="obsolete">Чтобы применить установки: Перезапустите приложение!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
diff --git a/i18n/ru/libtodayexampleplugin.ts b/i18n/ru/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/ru/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libtodayweatherplugin.ts b/i18n/ru/libtodayweatherplugin.ts
index 95ea564..26f8ad0 100644
--- a/i18n/ru/libtodayweatherplugin.ts
+++ b/i18n/ru/libtodayweatherplugin.ts
@@ -107,11 +107,15 @@ Pres: </source>
     </message>
     <message>
         <source> hPa</source>
-        <translation>кПа</translation>
+        <translation type="obsolete">кПа</translation>
     </message>
     <message>
         <source> Hg</source>
         <translation>ртути</translation>
     </message>
+    <message>
+        <source> kPa</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/libvolumeapplet2.ts b/i18n/ru/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ru/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ru/libvpn.ts b/i18n/ru/libvpn.ts
index 3ed1f4f..581fa79 100644
--- a/i18n/ru/libvpn.ts
+++ b/i18n/ru/libvpn.ts
@@ -26,11 +26,15 @@
     <name>VPNNetNode</name>
     <message>
         <source>VPN Connection</source>
-        <translation>VPN соединение</translation>
+        <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 type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/libwebstyle.ts b/i18n/ru/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/ru/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/libwlan.ts b/i18n/ru/libwlan.ts
index 3a18bf6..8d39cdf 100644
--- a/i18n/ru/libwlan.ts
+++ b/i18n/ru/libwlan.ts
@@ -3,99 +3,99 @@
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>Конфигурация радиосети</translation>
+        <translation type="unfinished">Конфигурация радиосети</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="unfinished">Общие</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Режим</translation>
+        <translation type="unfinished">Режим</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="unfinished">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>Указать &amp;Точку доступа</translation>
+        <translation type="unfinished">Указать &amp;Точку доступа</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>Указать &amp;Канал</translation>
+        <translation type="unfinished">Указать &amp;Канал</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>любой</translation>
+        <translation type="unfinished">любой</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Инфраструктура</translation>
+        <translation type="unfinished">Инфраструктура</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Авто</translation>
+        <translation type="unfinished">Авто</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Управляемый</translation>
+        <translation type="unfinished">Управляемый</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Равноправный</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>
+        <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>
+        <translation type="unfinished">Ключ &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Ключ &amp;4</translation>
+        <translation type="unfinished">Ключ &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Незашифрованные пакеты</translation>
+        <translation type="unfinished">Незашифрованные пакеты</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Принимать</translation>
+        <translation type="unfinished">&amp;Принимать</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;Отвергать</translation>
+        <translation type="unfinished">&amp;Отвергать</translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation>SSID</translation>
+        <translation type="unfinished">SSID</translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation>Просканировать окрестности</translation>
+        <translation type="unfinished">Просканировать окрестности</translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation>Кнл</translation>
+        <translation type="unfinished">Кнл</translation>
     </message>
 </context>
 <context>
@@ -184,52 +184,60 @@
         <source>Signal</source>
         <translation type="obsolete">Сигнал</translation>
     </message>
+    <message>
+        <source>SSID</source>
+        <translation type="obsolete">SSID</translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="obsolete">Кнл</translation>
+    </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Информация интерфейса</translation>
+        <translation type="unfinished">Информация интерфейса</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="unfinished">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Канал</translation>
+        <translation type="unfinished">Канал</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Режим</translation>
+        <translation type="unfinished">Режим</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Станция</translation>
+        <translation type="unfinished">Станция</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>Точка доступа</translation>
+        <translation type="unfinished">Точка доступа</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Скорость</translation>
+        <translation type="unfinished">Скорость</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Качество</translation>
+        <translation type="unfinished">Качество</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Шум</translation>
+        <translation type="unfinished">Шум</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Сигнал</translation>
+        <translation type="unfinished">Сигнал</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/main-tab.ts b/i18n/ru/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/ru/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/multiauth.ts b/i18n/ru/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ru/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ru/networksettings2.ts b/i18n/ru/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/ru/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/opie-console.ts b/i18n/ru/opie-console.ts
index 2c55e86..532e529 100644
--- a/i18n/ru/opie-console.ts
+++ b/i18n/ru/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation>Изм. ключ</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation>9600 бод</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 бод</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 бод</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 бод</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <source>Save Profile</source>
         <translation>Сохранить профиль</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>
@@ -746,7 +792,7 @@
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Не удалось набрать номер.</translation>
+        <translation type="obsolete">Не удалось набрать номер.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -784,6 +830,14 @@
         <source>Dismiss</source>
         <translation>Закрыть</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>
@@ -804,19 +858,19 @@
     </message>
     <message>
         <source>Font size</source>
-        <translation>Размер шрифта</translation>
+        <translation type="obsolete">Размер шрифта</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>мелкий</translation>
+        <translation type="obsolete">мелкий</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>средний</translation>
+        <translation type="obsolete">средний</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>крупный</translation>
+        <translation type="obsolete">крупный</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/ru/opie-eye.ts b/i18n/ru/opie-eye.ts
index 8b31b98..2633d7b 100644
--- a/i18n/ru/opie-eye.ts
+++ b/i18n/ru/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,12 +91,16 @@
         <source>Image</source>
         <translation>Изображение</translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
         <source>Phunk View - Config</source>
-        <translation>Вид - настройка</translation>
+        <translation type="obsolete">Вид - настройка</translation>
     </message>
     <message>
         <source>Browser Keyboard Actions</source>
@@ -48,6 +110,102 @@
         <source>Keyboard Configuration</source>
         <translation>Настройка клавиатуры</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>
 </context>
 <context>
     <name>QObject</name>
@@ -58,7 +216,7 @@
     </message>
     <message>
         <source>Opie Eye Caramba</source>
-        <translation>Карамба Глаз Opie</translation>
+        <translation type="obsolete">Карамба Глаз Opie</translation>
     </message>
     <message>
         <source>Show all files</source>
@@ -66,7 +224,77 @@
     </message>
     <message>
         <source>DirView</source>
-        <translation>Директории</translation>
+        <translation type="obsolete">Директории</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>
+</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/ru/opie-eye_slave.ts b/i18n/ru/opie-eye_slave.ts
index b47cf89..8ff0f37 100644
--- a/i18n/ru/opie-eye_slave.ts
+++ b/i18n/ru/opie-eye_slave.ts
@@ -156,157 +156,157 @@
     <message>
         <source>Colormode: Color
 </source>
-        <translation>Режим: Цветной
+        <translation type="obsolete">Режим: Цветной
 </translation>
     </message>
     <message>
         <source>Colormode: Black and white
 </source>
-        <translation>Режим: Черно-белый
+        <translation type="obsolete">Режим: Черно-белый
 </translation>
     </message>
     <message>
         <source>Basic</source>
-        <translation>Основной</translation>
+        <translation type="obsolete">Основной</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation>Обычный</translation>
+        <translation type="obsolete">Обычный</translation>
     </message>
     <message>
         <source>Fine</source>
-        <translation>Мелкий</translation>
+        <translation type="obsolete">Мелкий</translation>
     </message>
     <message>
         <source>Quality: %1
 </source>
-        <translation>Качество: %1
+        <translation type="obsolete">Качество: %1
 </translation>
     </message>
     <message>
         <source>Daylight</source>
-        <translation>Дневной свет</translation>
+        <translation type="obsolete">Дневной свет</translation>
     </message>
     <message>
         <source>Fluorescent</source>
-        <translation>Флуоресцентный</translation>
+        <translation type="obsolete">Флуоресцентный</translation>
     </message>
     <message>
         <source>Tungsten</source>
-        <translation>Вольфрам</translation>
+        <translation type="obsolete">Вольфрам</translation>
     </message>
     <message>
         <source>Standard light A</source>
-        <translation>Обычное освещение А</translation>
+        <translation type="obsolete">Обычное освещение А</translation>
     </message>
     <message>
         <source>Standard light B</source>
-        <translation>Обычное освещение Б</translation>
+        <translation type="obsolete">Обычное освещение Б</translation>
     </message>
     <message>
         <source>Standard light C</source>
-        <translation>Обычное освещение В</translation>
+        <translation type="obsolete">Обычное освещение В</translation>
     </message>
     <message>
         <source>D55</source>
-        <translation>D55</translation>
+        <translation type="obsolete">D55</translation>
     </message>
     <message>
         <source>D65</source>
-        <translation>D65</translation>
+        <translation type="obsolete">D65</translation>
     </message>
     <message>
         <source>D75</source>
-        <translation>D75</translation>
+        <translation type="obsolete">D75</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Прочие</translation>
+        <translation type="obsolete">Прочие</translation>
     </message>
     <message>
         <source>White Balance: %1
 </source>
-        <translation>Баланс белого: %1
+        <translation type="obsolete">Баланс белого: %1
 </translation>
     </message>
     <message>
         <source>Average</source>
-        <translation>Средний</translation>
+        <translation type="obsolete">Средний</translation>
     </message>
     <message>
         <source>Center weighted average</source>
-        <translation>Взвешенное среднее</translation>
+        <translation type="obsolete">Взвешенное среднее</translation>
     </message>
     <message>
         <source>Spot</source>
-        <translation>Место</translation>
+        <translation type="obsolete">Место</translation>
     </message>
     <message>
         <source>MultiSpot</source>
-        <translation>МультиМестный</translation>
+        <translation type="obsolete">МультиМестный</translation>
     </message>
     <message>
         <source>Pattern</source>
-        <translation>Шаблон</translation>
+        <translation type="obsolete">Шаблон</translation>
     </message>
     <message>
         <source>Partial</source>
-        <translation>Частичный</translation>
+        <translation type="obsolete">Частичный</translation>
     </message>
     <message>
         <source>Metering Mode: %1
 </source>
-        <translation>Режим измерения: %1
+        <translation type="obsolete">Режим измерения: %1
 </translation>
     </message>
     <message>
         <source>Not defined</source>
-        <translation>Не определен</translation>
+        <translation type="obsolete">Не определен</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation>Вручную</translation>
+        <translation type="obsolete">Вручную</translation>
     </message>
     <message>
         <source>Normal progam</source>
-        <translation>Обычная программа</translation>
+        <translation type="obsolete">Обычная программа</translation>
     </message>
     <message>
         <source>Aperture priority</source>
-        <translation>Приоритет апертуры</translation>
+        <translation type="obsolete">Приоритет апертуры</translation>
     </message>
     <message>
         <source>Shutter priority</source>
-        <translation>Приоритет задвижки</translation>
+        <translation type="obsolete">Приоритет задвижки</translation>
     </message>
     <message>
         <source>Creative progam
 (biased toward fast shutter speed</source>
-        <translation>Творческая программа
+        <translation type="obsolete">Творческая программа
 (сделана под короткую выдержку)</translation>
     </message>
     <message>
         <source>Action progam
 (biased toward fast shutter speed)</source>
-        <translation>Программа действия
+        <translation type="obsolete">Программа действия
 (сделана под короткую выдержку)</translation>
     </message>
     <message>
         <source>Portrait mode
 (for closeup photos with the background out of focus)</source>
-        <translation>Режим портрета
+        <translation type="obsolete">Режим портрета
 (для близких объектов с размытым фоном)</translation>
     </message>
     <message>
         <source>Landscape mode
 (for landscape photos with the background in focus)</source>
-        <translation>Альбомный режим 
+        <translation type="obsolete">Альбомный режим 
 (для альбомных фотографий с резким фоном)</translation>
     </message>
     <message>
         <source>Exposure Program: %1
 </source>
-        <translation>Программа выдержки: %1
+        <translation type="obsolete">Программа выдержки: %1
 </translation>
     </message>
     <message>
@@ -397,5 +397,29 @@
         <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/ru/opie-login.ts b/i18n/ru/opie-login.ts
index aa84e7b..db24b6e 100644
--- a/i18n/ru/opie-login.ts
+++ b/i18n/ru/opie-login.ts
@@ -9,7 +9,7 @@ accurately to calibrate your screen.</source>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Добро пожаловать в Opie</translation>
+        <translation type="obsolete">Добро пожаловать в Opie</translation>
     </message>
 </context>
 <context>
@@ -81,7 +81,54 @@ by an uncaught signal
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
-        <translation>&lt;center&gt;Добро пожаловать в OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
+        <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 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/ru/opie-sheet.ts b/i18n/ru/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/ru/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/opie-update-symlinks.ts b/i18n/ru/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ru/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ru/opieirc.ts b/i18n/ru/opieirc.ts
index bcc6f06..5f75e17 100644
--- a/i18n/ru/opieirc.ts
+++ b/i18n/ru/opieirc.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
@@ -58,6 +58,21 @@
     </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>
@@ -89,7 +104,7 @@
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Смена клички неизвестного человека</translation>
+        <translation type="obsolete">Смена клички неизвестного человека</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
@@ -109,7 +124,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>Принят CTCP VERSION от</translation>
+        <translation type="obsolete">Принят CTCP VERSION от</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -209,16 +224,113 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>Вы теперб известны как %1</translation>
+        <translation type="obsolete">Вы теперб известны как %1</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 теперь известен как %2</translation>
+        <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 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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -315,7 +427,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>Необходим порт</translation>
+        <translation type="obsolete">Необходим порт</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -323,7 +435,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>Необходимо настоящее имя</translation>
+        <translation type="obsolete">Необходимо настоящее имя</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -377,7 +489,7 @@ comma separated list of channel
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Соединение с</translation>
+        <translation type="obsolete">Соединение с</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -387,6 +499,25 @@ comma separated list of channel
         <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCSession</name>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished">Вы теперб известны как %1</translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished">Смена клички неизвестного человека</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished">%1 теперь известен как %2</translation>
+    </message>
 </context>
 <context>
     <name>IRCSettings</name>
@@ -466,6 +597,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation>Настройки</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>
@@ -513,4 +652,31 @@ comma separated list of channel
         <translation>Настроить поведение и внешний вид 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/ru/opiemail.ts b/i18n/ru/opiemail.ts
index b95b76b..783645f 100644
--- a/i18n/ru/opiemail.ts
+++ b/i18n/ru/opiemail.ts
@@ -80,7 +80,7 @@
     </message>
     <message>
         <source>No Receiver spezified</source>
-        <translation>Не задан адресат</translation>
+        <translation type="obsolete">Не задан адресат</translation>
     </message>
     <message>
         <source>Store message</source>
@@ -102,6 +102,10 @@
         <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 type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
@@ -367,7 +371,7 @@
         <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>Введите строку фильтра.
+        <translation type="obsolete">Введите строку фильтра.
 Потом нажмите &quot;получить список групп новостей&quot; снова и только группы,
 начинающиеся с этой строки, будут показаны.</translation>
     </message>
@@ -379,6 +383,12 @@ with that filter will be listet.</source>
         <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 type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
@@ -535,6 +545,18 @@ with that filter will be listet.</source>
         <source>Password</source>
         <translation>Пароль</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>
@@ -726,12 +748,16 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation>Показать предв. просмотр изображения</translation>
     </message>
+    <message>
+        <source>E-Mail by %1</source>
+        <translation type="unfinished">E-Mail от %1</translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
-        <translation>E-Mail от %1</translation>
+        <translation type="obsolete">E-Mail от %1</translation>
     </message>
     <message>
         <source>Mail</source>
@@ -769,6 +795,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/ru/opieplayer2.ts b/i18n/ru/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/ru/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/ru/opierec.ts b/i18n/ru/opierec.ts
index 40f5e46..f393efc 100644
--- a/i18n/ru/opierec.ts
+++ b/i18n/ru/opierec.ts
@@ -82,7 +82,7 @@ or a card isn&apos;t being recognized</source>
     </message>
     <message>
         <source> seconds</source>
-        <translation>секунд</translation>
+        <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;
@@ -150,15 +150,15 @@ the selected file?</source>
     </message>
     <message>
         <source>Rec</source>
-        <translation>Запись</translation>
+        <translation type="obsolete">Запись</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>Место</translation>
+        <translation type="obsolete">Место</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Дата</translation>
+        <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
@@ -170,7 +170,7 @@ the selected file?</source>
     </message>
     <message>
         <source>Stop</source>
-        <translation>Стоп</translation>
+        <translation type="obsolete">Стоп</translation>
     </message>
     <message>
         <source>Auto Mute</source>
@@ -178,7 +178,15 @@ the selected file?</source>
     </message>
     <message>
         <source>Stereo Channels</source>
-        <translation>Стерео каналы</translation>
+        <translation type="obsolete">Стерео каналы</translation>
+    </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/opimconverter.ts b/i18n/ru/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/ru/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/osearch.ts b/i18n/ru/osearch.ts
index 7170f81..734715c 100644
--- a/i18n/ru/osearch.ts
+++ b/i18n/ru/osearch.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Учет регистра</translation>
+        <translation type="obsolete">Учет регистра</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -65,6 +65,10 @@
         <source></source>
         <translation></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -97,15 +101,15 @@
     </message>
     <message>
         <source>show completed tasks</source>
-        <translation>показать завершенные задачи</translation>
+        <translation type="obsolete">показать завершенные задачи</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>показать события из прошлого</translation>
+        <translation type="obsolete">показать события из прошлого</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>искать в датах</translation>
+        <translation type="obsolete">искать в датах</translation>
     </message>
     <message>
         <source>File: </source>
@@ -121,11 +125,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>искать в содержимом</translation>
+        <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/ru/oxygen.ts b/i18n/ru/oxygen.ts
index a857fd2..718c5c8 100644
--- a/i18n/ru/oxygen.ts
+++ b/i18n/ru/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>Состав элементов (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/ru/oyatzee.ts b/i18n/ru/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/ru/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/packagemanager.ts b/i18n/ru/packagemanager.ts
index 6a00479..481b8f6 100644
--- a/i18n/ru/packagemanager.ts
+++ b/i18n/ru/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation>Установлены на устройстве:</translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -379,7 +419,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Нажмите чтобы обновить списки пакетов с серверов.</translation>
+        <translation type="obsolete">Нажмите чтобы обновить списки пакетов с серверов.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -387,7 +427,7 @@
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>Нажмите чтобы обновить все установленные пакеты если есть более свежая версия.</translation>
+        <translation type="obsolete">Нажмите чтобы обновить все установленные пакеты если есть более свежая версия.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -395,7 +435,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Нажмите чтобы скачать выделенные пакеты.</translation>
+        <translation type="obsolete">Нажмите чтобы скачать выделенные пакеты.</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -403,7 +443,7 @@
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation>Нажмите чтобы установить, убрать или обновить выделенные пакеты.</translation>
+        <translation type="obsolete">Нажмите чтобы установить, убрать или обновить выделенные пакеты.</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -415,7 +455,7 @@
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>Нажмите чтобы показать доступные, но не установленные пакеты.</translation>
+        <translation type="obsolete">Нажмите чтобы показать доступные, но не установленные пакеты.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -423,7 +463,7 @@
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>Нажмите чтобы показать пакеты установленные на этом устройстве.</translation>
+        <translation type="obsolete">Нажмите чтобы показать пакеты установленные на этом устройстве.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -431,7 +471,7 @@
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation>Нажмите чтобы показать пакеты установленные на этом устройстве для которых имеется более свежая версия.</translation>
+        <translation type="obsolete">Нажмите чтобы показать пакеты установленные на этом устройстве для которых имеется более свежая версия.</translation>
     </message>
     <message>
         <source>Filter by category</source>
@@ -455,7 +495,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Нажмите чтобы найти текст в названиях пакетов.</translation>
+        <translation type="obsolete">Нажмите чтобы найти текст в названиях пакетов.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -463,7 +503,7 @@
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation>Нажмите чтобы найти следующий пакет содержащий нужный вам текст в названии.</translation>
+        <translation type="obsolete">Нажмите чтобы найти следующий пакет содержащий нужный вам текст в названии.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -483,11 +523,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Нажмите чтобы настроить это приложение.</translation>
+        <translation type="obsolete">Нажмите чтобы настроить это приложение.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Нажмите чтобы скрыть панель поиска.</translation>
+        <translation type="obsolete">Нажмите чтобы скрыть панель поиска.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -645,7 +685,7 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation>Это список всех пакетов.
+        <translation type="obsolete">Это список всех пакетов.
 
 Синяя точка рядом с названием пакета означает, что пакет уже установлен.
 
@@ -659,7 +699,7 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Click here to apply current filter.</source>
-        <translation>Нажмите чтобы применить текущий фильтр.</translation>
+        <translation type="obsolete">Нажмите чтобы применить текущий фильтр.</translation>
     </message>
     <message>
         <source>Filter settings</source>
@@ -667,7 +707,7 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Click here to change the package filter criteria.</source>
-        <translation>Нажмите чтобы изменить критерии фильтра пакетов.</translation>
+        <translation type="obsolete">Нажмите чтобы изменить критерии фильтра пакетов.</translation>
     </message>
     <message>
         <source>Package Manager</source>
@@ -709,20 +749,106 @@ Click inside the box at the left to select a package.</source>
         <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation>Конфигурация была обновлена.  Вы хотите обновить информацию о сервере и пакетах?</translation>
     </message>
+    <message>
+        <source>This is a listing of all packages.
+
+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.
+
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to update package lists from servers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to download the currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install local package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to install a package file located on device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to configure this application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages available which have not been installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to apply current filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to change the package filter criteria.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to search for text in package names.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
-        <translation>OIpkg</translation>
+        <translation type="obsolete">OIpkg</translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
-        <translation>Ошибка инициализации libipkg</translation>
+        <translation type="obsolete">Ошибка инициализации libipkg</translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
-        <translation>Ошибка освобождения libipkg</translation>
+        <translation type="obsolete">Ошибка освобождения libipkg</translation>
+    </message>
+    <message>
+        <source>Linking packages installed in: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Links removed for: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -757,23 +883,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation>Сервер</translation>
+        <translation type="obsolete">Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Имя:</translation>
+        <translation type="obsolete">Имя:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation>Адрес:</translation>
+        <translation type="obsolete">Адрес:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation>Активный сервер</translation>
+        <translation type="obsolete">Активный сервер</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation>Обновить</translation>
+        <translation type="obsolete">Обновить</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -831,6 +957,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation>Выявление неисправностей</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Имя:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Место:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Имя:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Адрес:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -865,6 +1133,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation>Список файлов</translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/ru/powerchord.ts b/i18n/ru/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/ru/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/ru/pyquicklauncher.ts b/i18n/ru/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ru/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ru/qpe.ts b/i18n/ru/qpe.ts
index b5dc0f3..787d893 100644
--- a/i18n/ru/qpe.ts
+++ b/i18n/ru/qpe.ts
@@ -251,6 +251,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -270,6 +277,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/ru/security.ts b/i18n/ru/security.ts
index 6af2686..8f3a625 100644
--- a/i18n/ru/security.ts
+++ b/i18n/ru/security.ts
@@ -76,7 +76,7 @@ You can only select an actually configured user.</source>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation>&lt;p&gt;Все заданные пользователем участки будут потеряны.</translation>
+        <translation type="obsolete">&lt;p&gt;Все заданные пользователем участки будут потеряны.</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -84,31 +84,31 @@ You can only select an actually configured user.</source>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Да</translation>
+        <translation type="obsolete">Да</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation>192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -118,6 +118,26 @@ You can only select an actually configured user.</source>
         <source>None</source>
         <translation>Ни одного</translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -143,7 +163,7 @@ You can only select an actually configured user.</source>
     </message>
     <message>
         <source>Debug options</source>
-        <translation>Опции отладки</translation>
+        <translation type="obsolete">Опции отладки</translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
@@ -155,11 +175,43 @@ You can only select an actually configured user.</source>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
-        <translation>Разрешить пропускать аутентификацию</translation>
+        <translation type="obsolete">Разрешить пропускать аутентификацию</translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
-        <translation>Примечание: третья опция подразумевает вторую</translation>
+        <translation type="obsolete">Примечание: третья опция подразумевает вторую</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>
@@ -521,12 +573,8 @@ Beware that all manually entered net ranges will be lost!</source>
 <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/sfcave-sdl.ts b/i18n/ru/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/ru/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/ru/sfcave.ts b/i18n/ru/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/ru/sfcave.ts
+++ b/i18n/ru/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ru/simple-icon.ts b/i18n/ru/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/ru/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/simple-main.ts b/i18n/ru/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/ru/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/simple-pim.ts b/i18n/ru/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/ru/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/simple.ts b/i18n/ru/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/ru/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/stocktickertest.ts b/i18n/ru/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/ru/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/sysinfo.ts b/i18n/ru/sysinfo.ts
index 5a3eb77..11899d1 100644
--- a/i18n/ru/sysinfo.ts
+++ b/i18n/ru/sysinfo.ts
@@ -67,7 +67,7 @@
     </message>
     <message>
         <source>Compare:</source>
-        <translation>Сравнить:</translation>
+        <translation type="obsolete">Сравнить:</translation>
     </message>
 </context>
 <context>
@@ -349,6 +349,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation>Бенчмарки</translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -392,5 +396,9 @@ to this process?</source>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Производитель:</translation>
     </message>
+    <message>
+        <source>Built against Qt/E </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/tableviewer.ts b/i18n/ru/tableviewer.ts
index 8a589c7..bc71abb 100644
--- a/i18n/ru/tableviewer.ts
+++ b/i18n/ru/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Не смог установить значение по умлочанию для %1, ключ не добавлена.</translation>
+        <translation type="obsolete">KeyList::addKey() Не смог установить значение по умлочанию для %1, ключ не добавлена.</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation>DataElem::setField(%1, %2) Нужный тип не найден</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) Нужный тип не найден</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/ru/textedit.ts b/i18n/ru/textedit.ts
index e7c1046..5db6ff9 100644
--- a/i18n/ru/textedit.ts
+++ b/i18n/ru/textedit.ts
@@ -200,6 +200,10 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
         <translation>Вы действительно хотите&lt;BR&gt;&lt;B&gt;удалить&lt;/B&gt; текущий файл
 с диска?&lt;BR&gt;Удаление &lt;B&gt;безвозвратное!&lt;/B&gt;</translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/ru/today.ts b/i18n/ru/today.ts
index e093c0d..b547649 100644
--- a/i18n/ru/today.ts
+++ b/i18n/ru/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Сегодня</translation>
+        <translation type="unfinished">Сегодня</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Нет плагинов</translation>
+        <translation type="obsolete">Нет плагинов</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -25,6 +25,14 @@
         <source>Owned by </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>
diff --git a/i18n/ru/todolist.ts b/i18n/ru/todolist.ts
index 495edb9..6cbd5ab 100644
--- a/i18n/ru/todolist.ts
+++ b/i18n/ru/todolist.ts
@@ -9,6 +9,29 @@
         <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 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>
@@ -34,6 +57,17 @@
     </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>
@@ -53,46 +87,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Opie Дела</translation>
+        <translation type="obsolete">Opie Дела</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Новая по образцу</translation>
+        <translation type="obsolete">Новая по образцу</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Новая задача</translation>
+        <translation type="obsolete">Новая задача</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Нажмите здесь чтобы создать новую задачу.</translation>
+        <translation type="obsolete">Нажмите здесь чтобы создать новую задачу.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Изменить задачу</translation>
+        <translation type="obsolete">Изменить задачу</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Нажмите здесь чтобы изменить эту задачу.</translation>
+        <translation type="obsolete">Нажмите здесь чтобы изменить эту задачу.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Просмотреть задачу</translation>
+        <translation type="obsolete">Просмотреть задачу</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Удалить...</translation>
+        <translation type="obsolete">Удалить...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Нажмите здесь чтобы убрать эту задачу.</translation>
+        <translation type="obsolete">Нажмите здесь чтобы убрать эту задачу.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Удалить все...</translation>
+        <translation type="obsolete">Удалить все...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,15 +134,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>Отправить</translation>
+        <translation type="obsolete">Отправить</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Нажмите здесь чтобы отправить эту задачу на другое устройство.</translation>
+        <translation type="obsolete">Нажмите здесь чтобы отправить эту задачу на другое устройство.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Найти</translation>
+        <translation type="obsolete">Найти</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -128,15 +162,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Данные</translation>
+        <translation type="obsolete">Данные</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Категория</translation>
+        <translation type="obsolete">Категория</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Опции</translation>
+        <translation type="obsolete">Опции</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -160,7 +194,7 @@ The list displays the following information:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Все категории</translation>
+        <translation type="obsolete">Все категории</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -194,7 +228,7 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Без категории</translation>
+        <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>
@@ -206,7 +240,7 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Сдублировать</translation>
+        <translation type="obsolete">Сдублировать</translation>
     </message>
     <message>
         <source>C.</source>
@@ -226,7 +260,7 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Настроить образцы</translation>
+        <translation type="obsolete">Настроить образцы</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/ru/wellenreiter.ts b/i18n/ru/wellenreiter.ts
index c29a7ff..03a9f17 100644
--- a/i18n/ru/wellenreiter.ts
+++ b/i18n/ru/wellenreiter.ts
@@ -129,7 +129,7 @@ is not available on this system
     </message>
     <message>
         <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation>&lt;p&gt;Версии Wireless Extension&lt;br&gt;не совпадают!&lt;p&gt;  Велленрейтер II : WE V%1&lt;br&gt;драйвер интерфейса: WE V%2</translation>
+        <translation type="obsolete">&lt;p&gt;Версии Wireless Extension&lt;br&gt;не совпадают!&lt;p&gt;  Велленрейтер II : WE V%1&lt;br&gt;драйвер интерфейса: WE V%2</translation>
     </message>
     <message>
         <source>Bring your device into
@@ -188,6 +188,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation>Функция доступна только в Встраиваемой сборке</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -232,7 +236,7 @@ joining a net.</source>
     <name>WellenreiterConfigBase</name>
     <message>
         <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation>Диалог конфигурации Велленрейтера II</translation>
+        <translation type="obsolete">Диалог конфигурации Велленрейтера II</translation>
     </message>
     <message>
         <source>Interface</source>
@@ -536,7 +540,7 @@ joining a net.</source>
     </message>
     <message>
         <source>Send proble requests</source>
-        <translation>Посылать пробные запросы</translation>
+        <translation type="obsolete">Посылать пробные запросы</translation>
     </message>
     <message>
         <source>&lt;automatic&gt;</source>
@@ -618,6 +622,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation>Командная строка для запуска GPS демона.</translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/ru/zlines.ts b/i18n/ru/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/ru/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ru/zsafe.ts b/i18n/ru/zsafe.ts
index e43d07b..69007b2 100644
--- a/i18n/ru/zsafe.ts
+++ b/i18n/ru/zsafe.ts
@@ -482,7 +482,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Не могу создать каталог
+        <translation type="obsolete">Не могу создать каталог
 %1
 
 ZСейф будет закрыт.</translation>
@@ -604,7 +604,7 @@ ZСейф будет закрыт.</translation>
 .../Documents/application
 
 ZSafe will now exit.</source>
-        <translation>Не могу создать каталог
+        <translation type="obsolete">Не могу создать каталог
 ...//Documents/application
 
 ZСейф будет закрыт.</translation>
@@ -614,7 +614,7 @@ ZСейф будет закрыт.</translation>
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
-        <translation>Не могу создать каталог
+        <translation type="obsolete">Не могу создать каталог
 ...//Documents/application/zsafe
 
 ZСейф будет закрыт.</translation>
@@ -649,7 +649,7 @@ ZСейф будет закрыт.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Правка записи</translation>
+        <translation type="obsolete">Правка записи</translation>
     </message>
     <message>
         <source>Username</source>
@@ -661,7 +661,7 @@ ZСейф будет закрыт.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Создать запись</translation>
+        <translation type="obsolete">Создать запись</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -827,7 +827,7 @@ password</source>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Создать новый документ ZСейф</translation>
+        <translation type="obsolete">Создать новый документ ZСейф</translation>
     </message>
     <message>
         <source>Now you have to enter
@@ -843,27 +843,63 @@ newly created document.</source>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Сохранить документ ZСейф как..</translation>
+        <translation type="obsolete">Сохранить документ ZСейф как..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Менеджер Паролей&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Менеджер Паролей&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation>ZСейф версии 2.1.2-jv01b&lt;br&gt;</translation>
+        <translation type="obsolete">ZСейф версии 2.1.2-jv01b&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>написан Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">написан Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Перевод Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Перевод Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation>ZСейф версии 2.1.2&lt;br&gt;</translation>
+        <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 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/ru/zsame.ts b/i18n/ru/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/ru/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 4008f34..9eff8fe 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Ta imenik ne obstaja</translation>
+        <translation type="obsolete">Ta imenik ne obstaja</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -148,18 +148,18 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>Ne morem kopirati</translation>
+        <translation type="obsolete">Ne morem kopirati</translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>v
+        <translation type="obsolete">v
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Ne morem prenesti
+        <translation type="obsolete">Ne morem prenesti
 </translation>
     </message>
     <message>
@@ -177,7 +177,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Ali zares izbrišem
+        <translation type="obsolete">Ali zares izbrišem
 %1 datotek?</translation>
     </message>
     <message>
@@ -187,7 +187,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Res skopiram
+        <translation type="obsolete">Res skopiram
 %1 datotek?</translation>
     </message>
     <message>
@@ -197,29 +197,29 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 obstaja. Ali prepišem?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>že obstaja.
+        <translation type="obsolete">že obstaja.
 Ali jo res želite izbrisati?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 obstaja. Ali prepišem?</translation>
+        <translation type="obsolete">%1 obstaja. Ali prepišem?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Ne morem skopirati %1 v %2</translation>
+        <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>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 pravice pridržane 2002-2003
 LJ.Potter&lt;llornkcor@handhelds.org&gt;
 in je licencirano pod GPL</translation>
@@ -237,50 +237,91 @@ in je licencirano pod GPL</translation>
         <translation>Napaka</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
+        <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File Search</source>
+        <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
+        <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1?</source>
+        <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AdvancedFm :: </source>
+        <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> kB free</source>
+        <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to View 1</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to View 2</source>
+        <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>Not Yet Implemented</source>
+        <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>Could not copy 
-%1 
-to 
-%2</source>
+        <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/backup.ts b/i18n/sl/backup.ts
index dda5bdc..6a318ac 100644
--- a/i18n/sl/backup.ts
+++ b/i18n/sl/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Kopiraj in restavriraj... delam...</translation>
+        <translation type="obsolete">Kopiraj in restavriraj... delam...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -54,6 +54,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -71,7 +79,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>Shrani na</translation>
+        <translation type="obsolete">Shrani na</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -113,6 +121,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/sl/bartender.ts b/i18n/sl/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/sl/bartender.ts
+++ b/i18n/sl/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/sl/bluetooth-manager.ts b/i18n/sl/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/sl/bluetooth-manager.ts
+++ b/i18n/sl/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/sl/dagger.ts b/i18n/sl/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/sl/dagger.ts
+++ b/i18n/sl/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/sl/launchersettings.ts b/i18n/sl/launchersettings.ts
index 5a5ab0e..4832a51 100644
--- a/i18n/sl/launchersettings.ts
+++ b/i18n/sl/launchersettings.ts
@@ -191,6 +191,14 @@
         <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>
diff --git a/i18n/sl/libGPRS.ts b/i18n/sl/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/sl/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libaboutapplet.ts b/i18n/sl/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/sl/libaboutapplet.ts
+++ b/i18n/sl/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/sl/libbatteryapplet.ts b/i18n/sl/libbatteryapplet.ts
index 7fcea91..6e4576c 100644
--- a/i18n/sl/libbatteryapplet.ts
+++ b/i18n/sl/libbatteryapplet.ts
@@ -6,10 +6,6 @@
         <translation>Polnim</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Status baterije:</translation>
     </message>
@@ -47,7 +43,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Čas baterije do konca</translation>
+        <translation type="obsolete">Čas baterije do konca</translation>
     </message>
     <message>
         <source>Close</source>
@@ -71,11 +67,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Delež ostanka baterije:</translation>
+        <translation type="obsolete">Delež ostanka baterije:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Preostali čas baterije:</translation>
+        <translation type="obsolete">Preostali čas baterije:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -86,11 +82,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/sl/libbluetooth.ts b/i18n/sl/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/sl/libbluetooth.ts
+++ b/i18n/sl/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libbrightnessapplet.ts b/i18n/sl/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/libcable.ts b/i18n/sl/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/sl/libcable.ts
+++ b/i18n/sl/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/libcardmonapplet.ts b/i18n/sl/libcardmonapplet.ts
index 9aa016d..c9684b2 100644
--- a/i18n/sl/libcardmonapplet.ts
+++ b/i18n/sl/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Eject card 1: %1</source>
         <translation>Vstavite kartico 1: %1</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/libexample_applet.ts b/i18n/sl/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/sl/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libexample_board.ts b/i18n/sl/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/sl/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libexample_vpn.ts b/i18n/sl/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/sl/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libinterfaces.ts b/i18n/sl/libinterfaces.ts
index d731e4e..2078269 100644
--- a/i18n/sl/libinterfaces.ts
+++ b/i18n/sl/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Ponovno zaženi vmesnik</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/sl/libkppp.ts b/i18n/sl/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/sl/libkppp.ts
+++ b/i18n/sl/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/sl/liblancard.ts b/i18n/sl/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/sl/liblancard.ts
+++ b/i18n/sl/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/liblockapplet.ts b/i18n/sl/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/sl/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libmailwrapper.ts b/i18n/sl/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/sl/libmailwrapper.ts
+++ b/i18n/sl/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/sl/libmemoryapplet.ts b/i18n/sl/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/sl/libmemoryapplet.ts
+++ b/i18n/sl/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/sl/libnetworksettings2.ts b/i18n/sl/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/sl/libnetworksettings2.ts
+++ b/i18n/sl/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/libopiemm2.ts b/i18n/sl/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/sl/libopiemm2.ts
+++ b/i18n/sl/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libopiepim2.ts b/i18n/sl/libopiepim2.ts
index a3401e0..68c3586 100644
--- a/i18n/sl/libopiepim2.ts
+++ b/i18n/sl/libopiepim2.ts
@@ -370,6 +370,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
@@ -759,6 +862,34 @@ and </source>
         <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>
diff --git a/i18n/sl/libopiesecurity2.ts b/i18n/sl/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/sl/libopiesecurity2.ts
+++ b/i18n/sl/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/libopietooth2.ts b/i18n/sl/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/sl/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libopietooth2applet.ts b/i18n/sl/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/sl/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libopieui2.ts b/i18n/sl/libopieui2.ts
index c800f61..c4de84f 100644
--- a/i18n/sl/libopieui2.ts
+++ b/i18n/sl/libopieui2.ts
@@ -1,39 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>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>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
@@ -211,6 +177,25 @@
     </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>
@@ -218,6 +203,21 @@
     </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>
diff --git a/i18n/sl/libphasestyle.ts b/i18n/sl/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/sl/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libppp.ts b/i18n/sl/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/sl/libppp.ts
+++ b/i18n/sl/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/sl/libprofile.ts b/i18n/sl/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/sl/libprofile.ts
+++ b/i18n/sl/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/sl/libqpickboard.ts b/i18n/sl/libqpickboard.ts
index 488fb8f..694b19e 100644
--- a/i18n/sl/libqpickboard.ts
+++ b/i18n/sl/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libscreenshotapplet.ts b/i18n/sl/libscreenshotapplet.ts
index ef58222..0daab17 100644
--- a/i18n/sl/libscreenshotapplet.ts
+++ b/i18n/sl/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/libtodayaddressbookplugin.ts b/i18n/sl/libtodayaddressbookplugin.ts
index ea68edf..1d2a0d8 100644
--- a/i18n/sl/libtodayaddressbookplugin.ts
+++ b/i18n/sl/libtodayaddressbookplugin.ts
@@ -10,14 +10,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,10 +51,6 @@ Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/sl/libtodayexampleplugin.ts b/i18n/sl/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/sl/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libtodayweatherplugin.ts b/i18n/sl/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/sl/libtodayweatherplugin.ts
+++ b/i18n/sl/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/libvolumeapplet2.ts b/i18n/sl/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/libvpn.ts b/i18n/sl/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/sl/libvpn.ts
+++ b/i18n/sl/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/libwebstyle.ts b/i18n/sl/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/sl/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libwlan.ts b/i18n/sl/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/sl/libwlan.ts
+++ b/i18n/sl/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/sl/main-tab.ts b/i18n/sl/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/sl/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/multiauth.ts b/i18n/sl/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/networksettings2.ts b/i18n/sl/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/sl/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/opie-console.ts b/i18n/sl/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/sl/opie-console.ts
+++ b/i18n/sl/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/sl/opie-eye.ts b/i18n/sl/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/sl/opie-eye.ts
+++ b/i18n/sl/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/opie-eye_slave.ts b/i18n/sl/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/sl/opie-eye_slave.ts
+++ b/i18n/sl/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/opie-login.ts b/i18n/sl/opie-login.ts
index 0ce0332..cb42a27 100644
--- a/i18n/sl/opie-login.ts
+++ b/i18n/sl/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -75,8 +71,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/sl/opie-sheet.ts b/i18n/sl/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/sl/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/opie-update-symlinks.ts b/i18n/sl/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/opieirc.ts b/i18n/sl/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/sl/opieirc.ts
+++ b/i18n/sl/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/sl/opiemail.ts b/i18n/sl/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/sl/opiemail.ts
+++ b/i18n/sl/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/sl/opieplayer2.ts b/i18n/sl/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/sl/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/sl/opierec.ts b/i18n/sl/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/sl/opierec.ts
+++ b/i18n/sl/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/opimconverter.ts b/i18n/sl/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/sl/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/osearch.ts b/i18n/sl/osearch.ts
index e20a0f4..97ed663 100644
--- a/i18n/sl/osearch.ts
+++ b/i18n/sl/osearch.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -96,35 +96,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show completed tasks</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/oxygen.ts b/i18n/sl/oxygen.ts
index 95ea62e..8a90e8e 100644
--- a/i18n/sl/oxygen.ts
+++ b/i18n/sl/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/sl/oyatzee.ts b/i18n/sl/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/sl/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/packagemanager.ts b/i18n/sl/packagemanager.ts
index 46ae98a..b27fb81 100644
--- a/i18n/sl/packagemanager.ts
+++ b/i18n/sl/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -274,9 +314,6 @@
     </message>
 </context>
 <context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
@@ -296,7 +333,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Kliknite tu, da posodobite paketne sezname iz strežnikov.</translation>
+        <translation type="obsolete">Kliknite tu, da posodobite paketne sezname iz strežnikov.</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -304,7 +341,7 @@
     </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>
+        <translation type="obsolete">Kliknite tu, da nadgradite vse naložene pakete, če je novejša različica na voljo.</translation>
     </message>
     <message>
         <source>Download</source>
@@ -312,7 +349,7 @@
     </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>
+        <translation type="obsolete">Kliknite tu, da prenesete k sebi trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -320,7 +357,7 @@
     </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>
+        <translation type="obsolete">Kliknite tu, da naložite, odstranite ali posodbite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -332,7 +369,7 @@
     </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>
+        <translation type="obsolete">Kliknite tu, da prikažem nenaložene pakete, ki so na voljo.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -340,7 +377,7 @@
     </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>
+        <translation type="obsolete">Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -348,7 +385,7 @@
     </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>
+        <translation type="obsolete">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>
@@ -372,7 +409,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Kliknite tu, da najdete besedilo v paketnih imenih.</translation>
+        <translation type="obsolete">Kliknite tu, da najdete besedilo v paketnih imenih.</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -380,7 +417,7 @@
     </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>
+        <translation type="obsolete">Kliknite tu, da najdete naslednje ime paketa, ki vsebuje iskano besedilo.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -400,11 +437,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Kliknite tu, da spremenite nastavitve temu programu.</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Kliknite tu, da skijem iskalno orodno vrstico.</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -563,84 +600,140 @@ Ste prepričani?
         <translation type="obsolete">Posodabljam Zaganjalnik...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -676,23 +769,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Strežnik</translation>
+        <translation type="obsolete">Strežnik</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Ime:</translation>
+        <translation type="obsolete">Ime:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Naslov:</translation>
+        <translation type="obsolete">Naslov:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Aktivni strežnik</translation>
+        <translation type="obsolete">Aktivni strežnik</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Posodobi</translation>
+        <translation type="obsolete">Posodobi</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -750,6 +843,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Problematičen izhod</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Ime:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Lokacija:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Ime:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Naslov:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -782,6 +1017,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
@@ -827,9 +1074,6 @@ Click inside the box at the left to select a package.</source>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
diff --git a/i18n/sl/powerchord.ts b/i18n/sl/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/sl/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/sl/pyquicklauncher.ts b/i18n/sl/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index 990566b..8e973bb 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -242,6 +242,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -261,6 +268,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/sl/security.ts b/i18n/sl/security.ts
index 5272fc3..7e07319 100644
--- a/i18n/sl/security.ts
+++ b/i18n/sl/security.ts
@@ -70,40 +70,32 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -113,6 +105,26 @@ You can only select an actually configured user.</source>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -137,23 +149,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/sfcave.ts b/i18n/sl/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/sl/sfcave.ts
+++ b/i18n/sl/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/simple-icon.ts b/i18n/sl/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/sl/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/simple-main.ts b/i18n/sl/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/sl/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/simple-pim.ts b/i18n/sl/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/sl/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/simple.ts b/i18n/sl/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/sl/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/stocktickertest.ts b/i18n/sl/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/sl/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/sysinfo.ts b/i18n/sl/sysinfo.ts
index 45dea86..818bf2e 100644
--- a/i18n/sl/sysinfo.ts
+++ b/i18n/sl/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -314,6 +310,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -349,5 +349,9 @@ to this process?</source>
         <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 4b757f6..302af4d 100644
--- a/i18n/sl/tableviewer.ts
+++ b/i18n/sl/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Ne uspem narediti privzete vrednosti za tip %1, ključ ni dodan.</translation>
+        <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>DataElem::setField(%1, %2) Ne najdem veljavnega tipa</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) Ne najdem veljavnega tipa</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/sl/textedit.ts b/i18n/sl/textedit.ts
index 751bb8b..39fa2a4 100644
--- a/i18n/sl/textedit.ts
+++ b/i18n/sl/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
 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>
diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index 95ebc14..c21ad0b 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Danes</translation>
+        <translation type="unfinished">Danes</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -14,15 +14,19 @@
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
-        <source>No plugins found</source>
+        <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins activated</source>
+        <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to launch the associated app</source>
+        <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>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index 3d03490..4cc15ae 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -9,6 +9,29 @@
         <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>
@@ -34,6 +57,17 @@
     </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>
@@ -51,48 +85,28 @@
         <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New Task</source>
-        <translation type="unfinished">Novo opravilo</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Novo opravilo</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">Uredi opravilo</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Uredi opravilo</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation type="unfinished">Poglej opravila</translation>
+        <translation type="obsolete">Poglej opravila</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation type="unfinished">Izbriši...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Izbriši...</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation type="unfinished">Izbriši vse...</translation>
+        <translation type="obsolete">Izbriši vse...</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,15 +114,11 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation type="unfinished">Prežarči</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Prežarči</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished">Najdi</translation>
+        <translation type="obsolete">Najdi</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -128,15 +138,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation type="unfinished">Podatki</translation>
+        <translation type="obsolete">Podatki</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorija</translation>
+        <translation type="obsolete">Kategorija</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished">Izbire</translation>
+        <translation type="obsolete">Izbire</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -154,7 +164,7 @@ The list displays the following information:
     </message>
     <message>
         <source>All Categories</source>
-        <translation type="unfinished">Vse kategorije</translation>
+        <translation type="obsolete">Vse kategorije</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -192,7 +202,7 @@ Izhod?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished">Neizpolnjeno</translation>
+        <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>
@@ -204,7 +214,7 @@ Izhod?</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation type="unfinished">Podvoji</translation>
+        <translation type="obsolete">Podvoji</translation>
     </message>
     <message>
         <source>C.</source>
@@ -223,10 +233,6 @@ Izhod?</translation>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/sl/wellenreiter.ts b/i18n/sl/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/sl/wellenreiter.ts
+++ b/i18n/sl/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/sl/zlines.ts b/i18n/sl/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/sl/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/zsafe.ts b/i18n/sl/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/sl/zsafe.ts
+++ b/i18n/sl/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/zsame.ts b/i18n/sl/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/sl/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/advancedfm.ts b/i18n/xx/advancedfm.ts
index 4806095..9b2d737 100644
--- a/i18n/xx/advancedfm.ts
+++ b/i18n/xx/advancedfm.ts
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
@@ -124,7 +124,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -145,7 +145,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>File Exists!</source>
@@ -154,17 +154,17 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Copy </source>
@@ -177,7 +177,7 @@ exists. Ok to overwrite?</source>
     <message>
         <source>Could not move
 </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
@@ -198,22 +198,22 @@ exists. Ok to overwrite?</source>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>FOO</translation>
+        <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>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
@@ -231,7 +231,7 @@ and is licensed by the GPL</source>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>File Search</source>
@@ -240,12 +240,12 @@ It is not bookmarked!</source>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
@@ -268,10 +268,67 @@ and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
+        <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>
diff --git a/i18n/xx/backup.ts b/i18n/xx/backup.ts
index aa3cf41..b30575b 100644
--- a/i18n/xx/backup.ts
+++ b/i18n/xx/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -62,6 +62,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -79,7 +87,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -125,6 +133,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/xx/bartender.ts b/i18n/xx/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/xx/bartender.ts
+++ b/i18n/xx/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/xx/bluetooth-manager.ts b/i18n/xx/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/xx/bluetooth-manager.ts
+++ b/i18n/xx/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/xx/dagger.ts b/i18n/xx/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/xx/dagger.ts
+++ b/i18n/xx/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/xx/launchersettings.ts b/i18n/xx/launchersettings.ts
index fc7f654..a17de22 100644
--- a/i18n/xx/launchersettings.ts
+++ b/i18n/xx/launchersettings.ts
@@ -176,6 +176,14 @@
         <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>
diff --git a/i18n/xx/libGPRS.ts b/i18n/xx/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/xx/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libaboutapplet.ts b/i18n/xx/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/xx/libaboutapplet.ts
+++ b/i18n/xx/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/xx/libbatteryapplet.ts b/i18n/xx/libbatteryapplet.ts
index 5a7d833..d3a994e 100644
--- a/i18n/xx/libbatteryapplet.ts
+++ b/i18n/xx/libbatteryapplet.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Battery status</source>
@@ -71,11 +71,11 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
@@ -86,11 +86,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/xx/libbluetooth.ts b/i18n/xx/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/xx/libbluetooth.ts
+++ b/i18n/xx/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/libbrightnessapplet.ts b/i18n/xx/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/libcable.ts b/i18n/xx/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/xx/libcable.ts
+++ b/i18n/xx/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/libcardmonapplet.ts b/i18n/xx/libcardmonapplet.ts
index 96b99df..df7dd25 100644
--- a/i18n/xx/libcardmonapplet.ts
+++ b/i18n/xx/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libexample_applet.ts b/i18n/xx/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/xx/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libexample_board.ts b/i18n/xx/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/xx/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libexample_vpn.ts b/i18n/xx/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/xx/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libinterfaces.ts b/i18n/xx/libinterfaces.ts
index a99ccce..1d5ce98 100644
--- a/i18n/xx/libinterfaces.ts
+++ b/i18n/xx/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/xx/libkppp.ts b/i18n/xx/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/xx/libkppp.ts
+++ b/i18n/xx/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/xx/liblancard.ts b/i18n/xx/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/xx/liblancard.ts
+++ b/i18n/xx/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/liblockapplet.ts b/i18n/xx/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/xx/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libmailwrapper.ts b/i18n/xx/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/xx/libmailwrapper.ts
+++ b/i18n/xx/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/xx/libmemoryapplet.ts b/i18n/xx/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/xx/libmemoryapplet.ts
+++ b/i18n/xx/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/xx/libnetworksettings2.ts b/i18n/xx/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/xx/libnetworksettings2.ts
+++ b/i18n/xx/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/libopiemm2.ts b/i18n/xx/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/xx/libopiemm2.ts
+++ b/i18n/xx/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/libopiepim2.ts b/i18n/xx/libopiepim2.ts
index d9debef..e066a6c 100644
--- a/i18n/xx/libopiepim2.ts
+++ b/i18n/xx/libopiepim2.ts
@@ -595,6 +595,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
@@ -1046,6 +1149,34 @@ and </source>
         <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>
diff --git a/i18n/xx/libopiesecurity2.ts b/i18n/xx/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/xx/libopiesecurity2.ts
+++ b/i18n/xx/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/libopietooth2.ts b/i18n/xx/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/xx/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libopietooth2applet.ts b/i18n/xx/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/xx/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libopieui2.ts b/i18n/xx/libopieui2.ts
index 93d0c23..47149da 100644
--- a/i18n/xx/libopieui2.ts
+++ b/i18n/xx/libopieui2.ts
@@ -112,19 +112,15 @@
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">FOO</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
@@ -172,15 +168,15 @@
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
@@ -448,15 +444,19 @@ and </source>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -470,15 +470,15 @@ and </source>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/xx/libphasestyle.ts b/i18n/xx/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/xx/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libppp.ts b/i18n/xx/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/xx/libppp.ts
+++ b/i18n/xx/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/xx/libprofile.ts b/i18n/xx/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/xx/libprofile.ts
+++ b/i18n/xx/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/xx/libqpickboard.ts b/i18n/xx/libqpickboard.ts
index 06401ee..669f523 100644
--- a/i18n/xx/libqpickboard.ts
+++ b/i18n/xx/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>FOO</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/libscreenshotapplet.ts b/i18n/xx/libscreenshotapplet.ts
index 4bd8725..e2e0b3d 100644
--- a/i18n/xx/libscreenshotapplet.ts
+++ b/i18n/xx/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libtodayaddressbookplugin.ts b/i18n/xx/libtodayaddressbookplugin.ts
index 916f1a5..9cf9b1a 100644
--- a/i18n/xx/libtodayaddressbookplugin.ts
+++ b/i18n/xx/libtodayaddressbookplugin.ts
@@ -11,11 +11,11 @@
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
diff --git a/i18n/xx/libtodayexampleplugin.ts b/i18n/xx/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/xx/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libtodayweatherplugin.ts b/i18n/xx/libtodayweatherplugin.ts
index 54f59f5..22772b4 100644
--- a/i18n/xx/libtodayweatherplugin.ts
+++ b/i18n/xx/libtodayweatherplugin.ts
@@ -106,11 +106,15 @@ Pres: </source>
     </message>
     <message>
         <source> hPa</source>
-        <translation>FOO</translation>
+        <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/libvolumeapplet2.ts b/i18n/xx/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/libvpn.ts b/i18n/xx/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/xx/libvpn.ts
+++ b/i18n/xx/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/libwebstyle.ts b/i18n/xx/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/xx/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libwlan.ts b/i18n/xx/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/xx/libwlan.ts
+++ b/i18n/xx/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/xx/main-tab.ts b/i18n/xx/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/xx/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/multiauth.ts b/i18n/xx/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/networksettings2.ts b/i18n/xx/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/xx/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/opie-console.ts b/i18n/xx/opie-console.ts
index b93ab4a..580f614 100644
--- a/i18n/xx/opie-console.ts
+++ b/i18n/xx/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">FOO {4800?}</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">FOO {2400?}</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">FOO {1200?}</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -746,7 +792,7 @@
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Cancelling...</source>
@@ -784,6 +830,14 @@
         <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>
@@ -804,19 +858,19 @@
     </message>
     <message>
         <source>Font size</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
diff --git a/i18n/xx/opie-eye.ts b/i18n/xx/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/xx/opie-eye.ts
+++ b/i18n/xx/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/opie-eye_slave.ts b/i18n/xx/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/xx/opie-eye_slave.ts
+++ b/i18n/xx/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/opie-login.ts b/i18n/xx/opie-login.ts
index a7dfdba..84e7eed 100644
--- a/i18n/xx/opie-login.ts
+++ b/i18n/xx/opie-login.ts
@@ -8,7 +8,7 @@ accurately to calibrate your screen.</source>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
@@ -90,8 +90,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/xx/opie-sheet.ts b/i18n/xx/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/xx/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/opie-update-symlinks.ts b/i18n/xx/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/opieirc.ts b/i18n/xx/opieirc.ts
index fb81a24..c76f237 100644
--- a/i18n/xx/opieirc.ts
+++ b/i18n/xx/opieirc.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>CTCP</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Query</source>
@@ -58,6 +58,21 @@
     </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>
@@ -125,7 +140,7 @@
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> has quit </source>
@@ -149,7 +164,7 @@
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
@@ -249,16 +264,113 @@
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>FOO</translation>
+        <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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -355,7 +467,7 @@
     </message>
     <message>
         <source>Port required</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nickname required</source>
@@ -363,7 +475,7 @@
     </message>
     <message>
         <source>Realname required</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
@@ -415,7 +527,7 @@ comma separated list of channel
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Server messages</source>
@@ -425,6 +537,25 @@ comma separated list of channel
         <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>
@@ -504,6 +635,14 @@ comma separated list of channel
         <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>
@@ -551,4 +690,31 @@ comma separated list of channel
         <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 242ccfc..99637a7 100644
--- a/i18n/xx/opiemail.ts
+++ b/i18n/xx/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/xx/opieplayer2.ts b/i18n/xx/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/xx/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/xx/opierec.ts b/i18n/xx/opierec.ts
index 5db0813..befd26e 100644
--- a/i18n/xx/opierec.ts
+++ b/i18n/xx/opierec.ts
@@ -112,7 +112,7 @@ or a card isn&apos;t being recognized</source>
     </message>
     <message>
         <source> seconds</source>
-        <translation>FOO</translation>
+        <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;
@@ -178,15 +178,15 @@ the selected file?</source>
     </message>
     <message>
         <source>Rec</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
@@ -202,14 +202,18 @@ the selected file?</source>
     </message>
     <message>
         <source>Stop</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/opimconverter.ts b/i18n/xx/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/xx/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/osearch.ts b/i18n/xx/osearch.ts
index 642b973..6116587 100644
--- a/i18n/xx/osearch.ts
+++ b/i18n/xx/osearch.ts
@@ -35,7 +35,7 @@
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Use wildcards</source>
@@ -85,6 +85,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -117,15 +121,15 @@
     </message>
     <message>
         <source>show completed tasks</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>File: </source>
@@ -141,11 +145,27 @@
     </message>
     <message>
         <source>search content</source>
-        <translation>FOO</translation>
+        <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 77a8623..e4b0674 100644
--- a/i18n/xx/oxygen.ts
+++ b/i18n/xx/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/xx/oyatzee.ts b/i18n/xx/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/xx/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/packagemanager.ts b/i18n/xx/packagemanager.ts
index 43c8bf9..1c4a9b0 100644
--- a/i18n/xx/packagemanager.ts
+++ b/i18n/xx/packagemanager.ts
@@ -59,6 +59,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -373,7 +413,7 @@
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upgrade</source>
@@ -381,7 +421,7 @@
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Download</source>
@@ -389,7 +429,7 @@
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Apply changes</source>
@@ -397,7 +437,7 @@
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Actions</source>
@@ -409,7 +449,7 @@
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Show installed packages</source>
@@ -417,7 +457,7 @@
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Show updated packages</source>
@@ -425,7 +465,7 @@
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Filter by category</source>
@@ -449,7 +489,7 @@
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Find next</source>
@@ -457,7 +497,7 @@
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
@@ -477,11 +517,11 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Servers:</source>
@@ -624,84 +664,140 @@ Are you sure?
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -737,23 +833,23 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
@@ -811,6 +907,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished">FOO</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -843,6 +1081,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
diff --git a/i18n/xx/powerchord.ts b/i18n/xx/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/xx/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/xx/pyquicklauncher.ts b/i18n/xx/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index 1f3d04f..6e36e11 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -384,6 +384,13 @@ Please charge the back-up battery.</source>
     </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>
@@ -403,6 +410,13 @@ Please charge the back-up battery.</source>
     </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>
diff --git a/i18n/xx/security.ts b/i18n/xx/security.ts
index 7d80f0f..9249cbe 100644
--- a/i18n/xx/security.ts
+++ b/i18n/xx/security.ts
@@ -70,40 +70,32 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">FOO {192.168.129.0/24?}</translation>
+        <translation type="obsolete">FOO {192.168.129.0/24?}</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Any</source>
@@ -113,6 +105,26 @@ You can only select an actually configured user.</source>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -137,23 +149,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/sfcave-sdl.ts b/i18n/xx/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/sfcave.ts b/i18n/xx/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/xx/sfcave.ts
+++ b/i18n/xx/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/simple-icon.ts b/i18n/xx/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/xx/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/simple-main.ts b/i18n/xx/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/xx/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/simple-pim.ts b/i18n/xx/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/xx/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/simple.ts b/i18n/xx/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/xx/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/stocktickertest.ts b/i18n/xx/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/xx/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/sysinfo.ts b/i18n/xx/sysinfo.ts
index 86edab2..c08c2d3 100644
--- a/i18n/xx/sysinfo.ts
+++ b/i18n/xx/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -342,6 +338,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -385,5 +385,9 @@ to this process?</source>
         <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 f786146..ef3c9c2 100644
--- a/i18n/xx/tableviewer.ts
+++ b/i18n/xx/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/xx/textedit.ts b/i18n/xx/textedit.ts
index d728ebf..633e468 100644
--- a/i18n/xx/textedit.ts
+++ b/i18n/xx/textedit.ts
@@ -202,6 +202,10 @@ Go ahead and save?
 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>
diff --git a/i18n/xx/today.ts b/i18n/xx/today.ts
index ac06e4e..37e7d76 100644
--- a/i18n/xx/today.ts
+++ b/i18n/xx/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -19,7 +19,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -29,6 +29,14 @@
         <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>
diff --git a/i18n/xx/todolist.ts b/i18n/xx/todolist.ts
index 9315713..cb3ae28 100644
--- a/i18n/xx/todolist.ts
+++ b/i18n/xx/todolist.ts
@@ -13,6 +13,29 @@
         <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>
@@ -38,6 +61,17 @@
     </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>
@@ -57,46 +91,46 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -104,15 +138,15 @@
     </message>
     <message>
         <source>Beam</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -132,15 +166,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -158,7 +192,7 @@ The list displays the following information:
     </message>
     <message>
         <source>All Categories</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -191,7 +225,7 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>FOO</translation>
+        <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>
@@ -203,7 +237,7 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>C.</source>
@@ -223,7 +257,7 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/xx/wellenreiter.ts b/i18n/xx/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/xx/wellenreiter.ts
+++ b/i18n/xx/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/xx/zlines.ts b/i18n/xx/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/xx/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/zsafe.ts b/i18n/xx/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/xx/zsafe.ts
+++ b/i18n/xx/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/zsame.ts b/i18n/xx/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/xx/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/advancedfm.ts b/i18n/zh_CN/advancedfm.ts
index e7e44d6..70a4f46 100644
--- a/i18n/zh_CN/advancedfm.ts
+++ b/i18n/zh_CN/advancedfm.ts
@@ -14,17 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></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="unfinished"></translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -105,12 +94,6 @@ and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -163,11 +146,6 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -180,98 +158,107 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
+        <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1?</source>
+        <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File Exists!</source>
+        <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
+        <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy %1 to %2</source>
+        <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>to
-</source>
+        <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
+        <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> As</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
+        <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>Could not move
-</source>
+        <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>Could not copy 
-%1 
-to 
-%2</source>
+        <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AdvancedFm Output</source>
+        <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advancedfm Beam out</source>
+        <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ir sent.</source>
+        <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
+        <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not rename</source>
+        <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Yet Implemented</source>
+        <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>
diff --git a/i18n/zh_CN/backup.ts b/i18n/zh_CN/backup.ts
index 75e23eb..c6f598c 100644
--- a/i18n/zh_CN/backup.ts
+++ b/i18n/zh_CN/backup.ts
@@ -2,10 +2,6 @@
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
@@ -54,6 +50,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -66,10 +70,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,6 +113,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/zh_CN/bartender.ts b/i18n/zh_CN/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/zh_CN/bartender.ts
+++ b/i18n/zh_CN/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/zh_CN/bluetooth-manager.ts b/i18n/zh_CN/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/zh_CN/bluetooth-manager.ts
+++ b/i18n/zh_CN/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/zh_CN/dagger.ts b/i18n/zh_CN/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/zh_CN/dagger.ts
+++ b/i18n/zh_CN/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/zh_CN/launchersettings.ts b/i18n/zh_CN/launchersettings.ts
index 2ef3cd4..7c7d23c 100644
--- a/i18n/zh_CN/launchersettings.ts
+++ b/i18n/zh_CN/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/zh_CN/libGPRS.ts b/i18n/zh_CN/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/zh_CN/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libaboutapplet.ts b/i18n/zh_CN/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/zh_CN/libaboutapplet.ts
+++ b/i18n/zh_CN/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libbatteryapplet.ts b/i18n/zh_CN/libbatteryapplet.ts
index 63d7afc..aeb2c4a 100644
--- a/i18n/zh_CN/libbatteryapplet.ts
+++ b/i18n/zh_CN/libbatteryapplet.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -62,27 +58,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
+        <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining: </source>
+        <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <source>Remaing Power: %1 %2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No jacket with battery inserted</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/libbluetooth.ts b/i18n/zh_CN/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/zh_CN/libbluetooth.ts
+++ b/i18n/zh_CN/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libbrightnessapplet.ts b/i18n/zh_CN/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_CN/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_CN/libcable.ts b/i18n/zh_CN/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/zh_CN/libcable.ts
+++ b/i18n/zh_CN/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/libcardmonapplet.ts b/i18n/zh_CN/libcardmonapplet.ts
index 3637f01..37329c3 100644
--- a/i18n/zh_CN/libcardmonapplet.ts
+++ b/i18n/zh_CN/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libexample_applet.ts b/i18n/zh_CN/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/zh_CN/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libexample_board.ts b/i18n/zh_CN/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/zh_CN/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libexample_vpn.ts b/i18n/zh_CN/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/zh_CN/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libinterfaces.ts b/i18n/zh_CN/libinterfaces.ts
index e871479..1a11276 100644
--- a/i18n/zh_CN/libinterfaces.ts
+++ b/i18n/zh_CN/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/zh_CN/libkppp.ts b/i18n/zh_CN/libkppp.ts
index bc82034..0982bb0 100644
--- a/i18n/zh_CN/libkppp.ts
+++ b/i18n/zh_CN/libkppp.ts
@@ -335,6 +335,10 @@ the device &quot;%1&quot;?</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/zh_CN/liblancard.ts b/i18n/zh_CN/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/zh_CN/liblancard.ts
+++ b/i18n/zh_CN/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/liblockapplet.ts b/i18n/zh_CN/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/zh_CN/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libmailwrapper.ts b/i18n/zh_CN/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/zh_CN/libmailwrapper.ts
+++ b/i18n/zh_CN/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/zh_CN/libmemoryapplet.ts b/i18n/zh_CN/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/zh_CN/libmemoryapplet.ts
+++ b/i18n/zh_CN/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/zh_CN/libnetworksettings2.ts b/i18n/zh_CN/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/zh_CN/libnetworksettings2.ts
+++ b/i18n/zh_CN/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/libopiemm2.ts b/i18n/zh_CN/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/zh_CN/libopiemm2.ts
+++ b/i18n/zh_CN/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libopiepim2.ts b/i18n/zh_CN/libopiepim2.ts
index 55cbf62..2a5182b 100644
--- a/i18n/zh_CN/libopiepim2.ts
+++ b/i18n/zh_CN/libopiepim2.ts
@@ -215,6 +215,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
@@ -604,6 +707,34 @@ and </source>
         <source>Sunday</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>
diff --git a/i18n/zh_CN/libopiesecurity2.ts b/i18n/zh_CN/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/zh_CN/libopiesecurity2.ts
+++ b/i18n/zh_CN/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/libopietooth2.ts b/i18n/zh_CN/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/zh_CN/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libopietooth2applet.ts b/i18n/zh_CN/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/zh_CN/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libopieui2.ts b/i18n/zh_CN/libopieui2.ts
index 51a5983..cf55c5f 100644
--- a/i18n/zh_CN/libopieui2.ts
+++ b/i18n/zh_CN/libopieui2.ts
@@ -1,27 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>OTimePickerDialogBase</name>
     <message>
-        <source>FileDialog</source>
+        <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open</source>
+        <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select Directory</source>
+        <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
-        <source>Style</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -29,52 +29,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
-        <source>OTimePickerDialogBase</source>
+        <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time:</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>:</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pick Time:</source>
+        <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Internal::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Size</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
-        <source>Date</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Name:</source>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/libphasestyle.ts b/i18n/zh_CN/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/zh_CN/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libppp.ts b/i18n/zh_CN/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/zh_CN/libppp.ts
+++ b/i18n/zh_CN/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/zh_CN/libprofile.ts b/i18n/zh_CN/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/zh_CN/libprofile.ts
+++ b/i18n/zh_CN/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/zh_CN/libqpickboard.ts b/i18n/zh_CN/libqpickboard.ts
index 488fb8f..694b19e 100644
--- a/i18n/zh_CN/libqpickboard.ts
+++ b/i18n/zh_CN/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libscreenshotapplet.ts b/i18n/zh_CN/libscreenshotapplet.ts
index ebc9a78..b882fb9 100644
--- a/i18n/zh_CN/libscreenshotapplet.ts
+++ b/i18n/zh_CN/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libtodayaddressbookplugin.ts b/i18n/zh_CN/libtodayaddressbookplugin.ts
index fef7050..ca0b09b 100644
--- a/i18n/zh_CN/libtodayaddressbookplugin.ts
+++ b/i18n/zh_CN/libtodayaddressbookplugin.ts
@@ -2,10 +2,6 @@
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34,14 +30,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_CN/libtodayexampleplugin.ts b/i18n/zh_CN/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/zh_CN/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libtodayweatherplugin.ts b/i18n/zh_CN/libtodayweatherplugin.ts
index 8f245b0..df681d2 100644
--- a/i18n/zh_CN/libtodayweatherplugin.ts
+++ b/i18n/zh_CN/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/libvolumeapplet2.ts b/i18n/zh_CN/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_CN/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_CN/libvpn.ts b/i18n/zh_CN/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/zh_CN/libvpn.ts
+++ b/i18n/zh_CN/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/libwebstyle.ts b/i18n/zh_CN/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/zh_CN/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libwlan.ts b/i18n/zh_CN/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/zh_CN/libwlan.ts
+++ b/i18n/zh_CN/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/zh_CN/main-tab.ts b/i18n/zh_CN/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/zh_CN/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/multiauth.ts b/i18n/zh_CN/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_CN/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_CN/networksettings2.ts b/i18n/zh_CN/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/zh_CN/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/opie-console.ts b/i18n/zh_CN/opie-console.ts
index d94b1ed..f6df35f 100644
--- a/i18n/zh_CN/opie-console.ts
+++ b/i18n/zh_CN/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <source>History</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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_CN/opie-eye.ts b/i18n/zh_CN/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/zh_CN/opie-eye.ts
+++ b/i18n/zh_CN/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/opie-eye_slave.ts b/i18n/zh_CN/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/zh_CN/opie-eye_slave.ts
+++ b/i18n/zh_CN/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/opie-login.ts b/i18n/zh_CN/opie-login.ts
index 7551ff5..f96e976 100644
--- a/i18n/zh_CN/opie-login.ts
+++ b/i18n/zh_CN/opie-login.ts
@@ -6,10 +6,6 @@
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
@@ -49,10 +45,6 @@ accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80,4 +72,51 @@ by an uncaught signal
         <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_CN/opie-sheet.ts b/i18n/zh_CN/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/zh_CN/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></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>
+    </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>
+    </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>
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/opie-update-symlinks.ts b/i18n/zh_CN/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_CN/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_CN/opieirc.ts b/i18n/zh_CN/opieirc.ts
index 53bd5c4..b510840 100644
--- a/i18n/zh_CN/opieirc.ts
+++ b/i18n/zh_CN/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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: %1</source>
@@ -116,18 +127,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -148,10 +147,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -219,6 +214,103 @@
         <source>No such nickname</source>
         <translation type="unfinished"></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>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Colors</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/zh_CN/opiemail.ts b/i18n/zh_CN/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/zh_CN/opiemail.ts
+++ b/i18n/zh_CN/opiemail.ts
@@ -79,10 +79,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -102,6 +98,10 @@
         <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>
@@ -360,17 +360,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -529,6 +529,18 @@ with that filter will be listet.</source>
         <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>
@@ -716,13 +728,13 @@ with that filter will be listet.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
@@ -759,6 +771,10 @@ with that filter will be listet.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/zh_CN/opieplayer2.ts b/i18n/zh_CN/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/zh_CN/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</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>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</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>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: </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></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/zh_CN/opierec.ts b/i18n/zh_CN/opierec.ts
index c9416cf..dd0423b 100644
--- a/i18n/zh_CN/opierec.ts
+++ b/i18n/zh_CN/opierec.ts
@@ -21,10 +21,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37,14 +33,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,10 +65,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -101,10 +85,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Low Disk Space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -115,10 +95,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -176,5 +152,13 @@ the selected file?</source>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/opimconverter.ts b/i18n/zh_CN/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/zh_CN/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/osearch.ts b/i18n/zh_CN/osearch.ts
index ed1df11..2446d75 100644
--- a/i18n/zh_CN/osearch.ts
+++ b/i18n/zh_CN/osearch.ts
@@ -46,10 +46,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -76,55 +76,55 @@
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
+        <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show</source>
+        <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>execute</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>open in filemanager</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>open with </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/oxygen.ts b/i18n/zh_CN/oxygen.ts
index 19798b5..be515dc 100644
--- a/i18n/zh_CN/oxygen.ts
+++ b/i18n/zh_CN/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/zh_CN/oyatzee.ts b/i18n/zh_CN/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/zh_CN/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/packagemanager.ts b/i18n/zh_CN/packagemanager.ts
index 05d9dba..3b60785 100644
--- a/i18n/zh_CN/packagemanager.ts
+++ b/i18n/zh_CN/packagemanager.ts
@@ -1,11 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
-    <name>DataManager</name>
-</context>
-<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
@@ -47,9 +41,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InputDialog</name>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallDlg</name>
@@ -128,15 +159,6 @@
     </message>
 </context>
 <context>
-    <name>InstallDlgImpl</name>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-</context>
-<context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
@@ -147,119 +169,123 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
+        <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade</source>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download</source>
+        <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply changes</source>
+        <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
+        <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show packages not installed</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show installed packages</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show updated packages</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Packages</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -269,78 +295,86 @@ A blue dot next to the package name indicates that the package is currently inst
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -375,79 +409,201 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Depends</source>
+        <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Reinstall</source>
+        <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Remove</source>
+        <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Overwrite</source>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Errors only</source>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal messages</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Informative messages</source>
+        <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Troubleshooting output</source>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -482,17 +638,17 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-</context>
-<context>
-    <name>QObject</name>
-</context>
-<context>
-    <name>QuestionDlg</name>
-</context>
-<context>
-    <name>SettingsImpl</name>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/powerchord.ts b/i18n/zh_CN/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/zh_CN/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/zh_CN/pyquicklauncher.ts b/i18n/zh_CN/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_CN/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_CN/qpe.ts b/i18n/zh_CN/qpe.ts
index bfab94d..8a704d2 100644
--- a/i18n/zh_CN/qpe.ts
+++ b/i18n/zh_CN/qpe.ts
@@ -242,6 +242,13 @@ accurately to calibrate your screen.</source>
     </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>
@@ -261,6 +268,13 @@ accurately to calibrate your screen.</source>
     </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>
diff --git a/i18n/zh_CN/quicklauncher.ts b/i18n/zh_CN/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_CN/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_CN/security.ts b/i18n/zh_CN/security.ts
index 584fa09..ca86afe 100644
--- a/i18n/zh_CN/security.ts
+++ b/i18n/zh_CN/security.ts
@@ -70,47 +70,35 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -137,23 +125,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <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>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/sfcave-sdl.ts b/i18n/zh_CN/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_CN/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_CN/sfcave.ts b/i18n/zh_CN/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/zh_CN/sfcave.ts
+++ b/i18n/zh_CN/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/simple-icon.ts b/i18n/zh_CN/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/zh_CN/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/simple-main.ts b/i18n/zh_CN/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/zh_CN/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/simple-pim.ts b/i18n/zh_CN/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/zh_CN/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/simple.ts b/i18n/zh_CN/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/zh_CN/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/stocktickertest.ts b/i18n/zh_CN/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/zh_CN/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/sysinfo.ts b/i18n/zh_CN/sysinfo.ts
index 1af3e2d..3528d42 100644
--- a/i18n/zh_CN/sysinfo.ts
+++ b/i18n/zh_CN/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -310,6 +306,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -345,5 +345,9 @@ to this process?</source>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Built against Qt/E </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/tableviewer.ts b/i18n/zh_CN/tableviewer.ts
index 7d41b6f..4570c99 100644
--- a/i18n/zh_CN/tableviewer.ts
+++ b/i18n/zh_CN/tableviewer.ts
@@ -1,16 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
diff --git a/i18n/zh_CN/textedit.ts b/i18n/zh_CN/textedit.ts
index bfe526a..f26a284 100644
--- a/i18n/zh_CN/textedit.ts
+++ b/i18n/zh_CN/textedit.ts
@@ -197,6 +197,10 @@ Go ahead and save?
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/zh_CN/today.ts b/i18n/zh_CN/today.ts
index 97b11e2..60233b2 100644
--- a/i18n/zh_CN/today.ts
+++ b/i18n/zh_CN/today.ts
@@ -14,11 +14,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins found</source>
+        <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No plugins activated</source>
+        <source>Today</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>
diff --git a/i18n/zh_CN/todolist.ts b/i18n/zh_CN/todolist.ts
index 6351fbb..4cf26d8 100644
--- a/i18n/zh_CN/todolist.ts
+++ b/i18n/zh_CN/todolist.ts
@@ -9,65 +9,68 @@
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Task Editor</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
     <message>
-        <source>Status</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>Opie Todolist</source>
+        <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter Task</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>silent</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>loud</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QWidget</name>
+    <name>Opie</name>
     <message>
-        <source>New from template</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Click here to create a new task.</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -75,46 +78,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
+        <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -131,18 +109,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -157,14 +123,6 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -222,10 +180,6 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_CN/wellenreiter.ts b/i18n/zh_CN/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/zh_CN/wellenreiter.ts
+++ b/i18n/zh_CN/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/zh_CN/zlines.ts b/i18n/zh_CN/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/zh_CN/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/zsafe.ts b/i18n/zh_CN/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/zh_CN/zsafe.ts
+++ b/i18n/zh_CN/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_CN/zsame.ts b/i18n/zh_CN/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/zh_CN/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 67a8ea4..90b925f 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>該目錄不存在</translation>
+        <translation type="obsolete">該目錄不存在</translation>
     </message>
     <message>
         <source>Copy As</source>
@@ -148,17 +148,17 @@
     <message>
         <source>Could not copy
 </source>
-        <translation>無法複製</translation>
+        <translation type="obsolete">無法複製</translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>至</translation>
+        <translation type="obsolete">至</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>無法移動</translation>
+        <translation type="obsolete">無法移動</translation>
     </message>
     <message>
         <source>Add To Documents</source>
@@ -175,7 +175,7 @@
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>確定要刪除
+        <translation type="obsolete">確定要刪除
 %1 個檔案?</translation>
     </message>
     <message>
@@ -185,7 +185,7 @@
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>確定要複製
+        <translation type="obsolete">確定要複製
 %1 個檔案?</translation>
     </message>
     <message>
@@ -195,12 +195,12 @@
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation> 已存在. 要覆蓋嗎?</translation>
+        <translation type="obsolete"> 已存在. 要覆蓋嗎?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation> 已經存在.
+        <translation type="obsolete"> 已經存在.
 您確定要刪除它?</translation>
     </message>
     <message>
@@ -208,18 +208,12 @@ Do you really want to delete it?</source>
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation type="unfinished">進階型檔案管理程式
+        <translation type="obsolete">進階型檔案管理程式
  版權 2002-2003 
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 ,授權為 GPL</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -232,52 +226,91 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy %1 to %2</source>
+        <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
+        <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-%1?</source>
+        <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AdvancedFm :: </source>
+        <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> kB free</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to View 1</source>
+        <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>Switch to View 2</source>
+        <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>Not Yet Implemented</source>
+        <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>Could not copy 
-%1 
-to 
-%2</source>
+        <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/backup.ts b/i18n/zh_TW/backup.ts
index 28a9c66..822744e 100644
--- a/i18n/zh_TW/backup.ts
+++ b/i18n/zh_TW/backup.ts
@@ -3,7 +3,7 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>備份與還原...執行中...</translation>
+        <translation type="obsolete">備份與還原...執行中...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
@@ -54,6 +54,14 @@
         <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>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -71,7 +79,7 @@
     </message>
     <message>
         <source>Save To</source>
-        <translation>儲存至</translation>
+        <translation type="obsolete">儲存至</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
@@ -113,6 +121,22 @@
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
diff --git a/i18n/zh_TW/bartender.ts b/i18n/zh_TW/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/zh_TW/bartender.ts
+++ b/i18n/zh_TW/bartender.ts
@@ -89,18 +89,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -135,18 +127,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
diff --git a/i18n/zh_TW/bluetooth-manager.ts b/i18n/zh_TW/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/zh_TW/bluetooth-manager.ts
+++ b/i18n/zh_TW/bluetooth-manager.ts
@@ -89,10 +89,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,6 +124,10 @@
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
diff --git a/i18n/zh_TW/dagger.ts b/i18n/zh_TW/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/zh_TW/dagger.ts
+++ b/i18n/zh_TW/dagger.ts
@@ -164,6 +164,14 @@
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
diff --git a/i18n/zh_TW/launchersettings.ts b/i18n/zh_TW/launchersettings.ts
index b54452f..679868d 100644
--- a/i18n/zh_TW/launchersettings.ts
+++ b/i18n/zh_TW/launchersettings.ts
@@ -176,6 +176,14 @@
         <source>Color:</source>
         <translation type="unfinished"></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>
diff --git a/i18n/zh_TW/libGPRS.ts b/i18n/zh_TW/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/zh_TW/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libaboutapplet.ts b/i18n/zh_TW/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/zh_TW/libaboutapplet.ts
+++ b/i18n/zh_TW/libaboutapplet.ts
@@ -11,21 +11,13 @@
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41,19 +33,7 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
         <translation type="unfinished"></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>&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.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -70,5 +50,25 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></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"></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>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libbatteryapplet.ts b/i18n/zh_TW/libbatteryapplet.ts
index 398f9d4..32dbd40 100644
--- a/i18n/zh_TW/libbatteryapplet.ts
+++ b/i18n/zh_TW/libbatteryapplet.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Percentage battery remaining</translation>
+        <translation type="obsolete">Percentage battery remaining</translation>
     </message>
     <message>
         <source>Battery status: </source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Battery time remaining</translation>
+        <translation type="obsolete">Battery time remaining</translation>
     </message>
     <message>
         <source>Failure</source>
@@ -66,27 +66,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
+        <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery time remaining: </source>
+        <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No jacket with battery inserted</source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no data</source>
+        <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <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>
diff --git a/i18n/zh_TW/libbluetooth.ts b/i18n/zh_TW/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/zh_TW/libbluetooth.ts
+++ b/i18n/zh_TW/libbluetooth.ts
@@ -51,15 +51,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,4 +82,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libbrightnessapplet.ts b/i18n/zh_TW/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/libcable.ts b/i18n/zh_TW/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/zh_TW/libcable.ts
+++ b/i18n/zh_TW/libcable.ts
@@ -156,11 +156,11 @@
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/libcardmonapplet.ts b/i18n/zh_TW/libcardmonapplet.ts
index 28c4368..83e93f0 100644
--- a/i18n/zh_TW/libcardmonapplet.ts
+++ b/i18n/zh_TW/libcardmonapplet.ts
@@ -29,5 +29,13 @@
         <source>Eject card 1: %1</source>
         <translation>移除 card 1: %1</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libexample_applet.ts b/i18n/zh_TW/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/zh_TW/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libexample_board.ts b/i18n/zh_TW/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/zh_TW/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libexample_vpn.ts b/i18n/zh_TW/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/zh_TW/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libinterfaces.ts b/i18n/zh_TW/libinterfaces.ts
index 8239ed9..080cc89 100644
--- a/i18n/zh_TW/libinterfaces.ts
+++ b/i18n/zh_TW/libinterfaces.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
diff --git a/i18n/zh_TW/libkppp.ts b/i18n/zh_TW/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/zh_TW/libkppp.ts
+++ b/i18n/zh_TW/libkppp.ts
@@ -335,6 +335,10 @@ needs</source>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
diff --git a/i18n/zh_TW/liblancard.ts b/i18n/zh_TW/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/zh_TW/liblancard.ts
+++ b/i18n/zh_TW/liblancard.ts
@@ -37,4 +37,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/liblockapplet.ts b/i18n/zh_TW/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/zh_TW/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libmailwrapper.ts b/i18n/zh_TW/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/zh_TW/libmailwrapper.ts
+++ b/i18n/zh_TW/libmailwrapper.ts
@@ -153,6 +153,23 @@
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</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>SMTPwrapper</name>
diff --git a/i18n/zh_TW/libmemoryapplet.ts b/i18n/zh_TW/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/zh_TW/libmemoryapplet.ts
+++ b/i18n/zh_TW/libmemoryapplet.ts
@@ -117,10 +117,6 @@ Memory is categorized as follows:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,5 +152,9 @@ Memory is categorized as follows:
         <source></source>
         <translation type="unfinished"></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/zh_TW/libnetworksettings2.ts b/i18n/zh_TW/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/zh_TW/libnetworksettings2.ts
+++ b/i18n/zh_TW/libnetworksettings2.ts
@@ -5,6 +5,14 @@
         <source>Command : </source>
         <translation type="unfinished"></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>
@@ -33,11 +41,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <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>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <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>
@@ -56,15 +80,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/libopiemm2.ts b/i18n/zh_TW/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/zh_TW/libopiemm2.ts
+++ b/i18n/zh_TW/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libopiepim2.ts b/i18n/zh_TW/libopiepim2.ts
index 416c7ef..11bda08 100644
--- a/i18n/zh_TW/libopiepim2.ts
+++ b/i18n/zh_TW/libopiepim2.ts
@@ -364,6 +364,109 @@ and </source>
     </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>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</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>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an 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>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
@@ -753,6 +856,34 @@ and </source>
         <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>
diff --git a/i18n/zh_TW/libopiesecurity2.ts b/i18n/zh_TW/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/zh_TW/libopiesecurity2.ts
+++ b/i18n/zh_TW/libopiesecurity2.ts
@@ -2,31 +2,31 @@
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/libopietooth2.ts b/i18n/zh_TW/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/zh_TW/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</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>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libopietooth2applet.ts b/i18n/zh_TW/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/zh_TW/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libopieui2.ts b/i18n/zh_TW/libopieui2.ts
index 9f50322..e39ee18 100644
--- a/i18n/zh_TW/libopieui2.ts
+++ b/i18n/zh_TW/libopieui2.ts
@@ -1,39 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>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>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
@@ -206,6 +172,25 @@
     </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>
@@ -213,6 +198,21 @@
     </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>
diff --git a/i18n/zh_TW/libphasestyle.ts b/i18n/zh_TW/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/zh_TW/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libppp.ts b/i18n/zh_TW/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/zh_TW/libppp.ts
+++ b/i18n/zh_TW/libppp.ts
@@ -124,42 +124,73 @@
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <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>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
@@ -188,10 +219,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -203,15 +230,61 @@
         <source>Set as default</source>
         <translation type="unfinished"></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>
+        <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 type="unfinished"></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>
+        <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>
diff --git a/i18n/zh_TW/libprofile.ts b/i18n/zh_TW/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/zh_TW/libprofile.ts
+++ b/i18n/zh_TW/libprofile.ts
@@ -22,10 +22,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,19 +106,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <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>
diff --git a/i18n/zh_TW/libqpickboard.ts b/i18n/zh_TW/libqpickboard.ts
index 7eef6c6..eb06783 100644
--- a/i18n/zh_TW/libqpickboard.ts
+++ b/i18n/zh_TW/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libscreenshotapplet.ts b/i18n/zh_TW/libscreenshotapplet.ts
index 81a2422..4e6aa6e 100644
--- a/i18n/zh_TW/libscreenshotapplet.ts
+++ b/i18n/zh_TW/libscreenshotapplet.ts
@@ -45,5 +45,13 @@
         <source>Connection to %1 failed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libtodayaddressbookplugin.ts b/i18n/zh_TW/libtodayaddressbookplugin.ts
index ea68edf..1d2a0d8 100644
--- a/i18n/zh_TW/libtodayaddressbookplugin.ts
+++ b/i18n/zh_TW/libtodayaddressbookplugin.ts
@@ -10,14 +10,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,10 +51,6 @@ Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_TW/libtodayexampleplugin.ts b/i18n/zh_TW/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/zh_TW/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libtodayweatherplugin.ts b/i18n/zh_TW/libtodayweatherplugin.ts
index 09a7c37..5931811 100644
--- a/i18n/zh_TW/libtodayweatherplugin.ts
+++ b/i18n/zh_TW/libtodayweatherplugin.ts
@@ -105,11 +105,11 @@ Pres: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> hPa</source>
+        <source> Hg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Hg</source>
+        <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/libvolumeapplet2.ts b/i18n/zh_TW/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/libvpn.ts b/i18n/zh_TW/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/zh_TW/libvpn.ts
+++ b/i18n/zh_TW/libvpn.ts
@@ -25,11 +25,11 @@
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <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 type="unfinished"></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>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/libwebstyle.ts b/i18n/zh_TW/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/zh_TW/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libwlan.ts b/i18n/zh_TW/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/zh_TW/libwlan.ts
+++ b/i18n/zh_TW/libwlan.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
@@ -102,12 +99,6 @@
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
diff --git a/i18n/zh_TW/main-tab.ts b/i18n/zh_TW/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/zh_TW/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/multiauth.ts b/i18n/zh_TW/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/networksettings2.ts b/i18n/zh_TW/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/zh_TW/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/opie-console.ts b/i18n/zh_TW/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/zh_TW/opie-console.ts
+++ b/i18n/zh_TW/opie-console.ts
@@ -264,6 +264,28 @@
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
@@ -355,6 +377,18 @@
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
@@ -488,6 +522,18 @@
         <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>
@@ -745,10 +791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,6 +826,14 @@
         <source>Dismiss</source>
         <translation type="unfinished"></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>
@@ -803,22 +853,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</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>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_TW/opie-eye.ts b/i18n/zh_TW/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/zh_TW/opie-eye.ts
+++ b/i18n/zh_TW/opie-eye.ts
@@ -1,5 +1,63 @@
 <!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>
+</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>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
@@ -33,19 +91,115 @@
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <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>
 </context>
@@ -57,15 +211,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <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>
+</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>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/opie-eye_slave.ts b/i18n/zh_TW/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/zh_TW/opie-eye_slave.ts
+++ b/i18n/zh_TW/opie-eye_slave.ts
@@ -144,225 +144,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/opie-login.ts b/i18n/zh_TW/opie-login.ts
index cd2cd6b..de40df3 100644
--- a/i18n/zh_TW/opie-login.ts
+++ b/i18n/zh_TW/opie-login.ts
@@ -9,7 +9,7 @@ accurately to calibrate your screen.</source>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>歡迎使用 Opie</translation>
+        <translation type="obsolete">歡迎使用 Opie</translation>
     </message>
 </context>
 <context>
@@ -93,8 +93,51 @@ by an uncaught signal
         <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;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <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>
diff --git a/i18n/zh_TW/opie-sheet.ts b/i18n/zh_TW/opie-sheet.ts
index dafcedb..3658300 100644
--- a/i18n/zh_TW/opie-sheet.ts
+++ b/i18n/zh_TW/opie-sheet.ts
@@ -205,19 +205,19 @@
     </message>
     <message>
         <source>Quit</source>
-        <translation>離開</translation>
+        <translation type="obsolete">離開</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation>離開(&amp;Q)</translation>
+        <translation type="obsolete">離開(&amp;Q)</translation>
     </message>
     <message>
         <source>General Help</source>
-        <translation>一般說明</translation>
+        <translation type="obsolete">一般說明</translation>
     </message>
     <message>
         <source>&amp;General</source>
-        <translation>一般(&amp;G)</translation>
+        <translation type="obsolete">一般(&amp;G)</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
@@ -225,7 +225,7 @@
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>關於(&amp;A)</translation>
+        <translation type="obsolete">關於(&amp;A)</translation>
     </message>
     <message>
         <source>Accept</source>
@@ -501,7 +501,7 @@
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>說明(&amp;H)</translation>
+        <translation type="obsolete">說明(&amp;H)</translation>
     </message>
     <message>
         <source>&amp;Row</source>
@@ -521,143 +521,143 @@
     </message>
     <message>
         <source>&amp;Standard</source>
-        <translation>標準(&amp;S)</translation>
+        <translation type="obsolete">標準(&amp;S)</translation>
     </message>
     <message>
         <source>Summation</source>
-        <translation>總和</translation>
+        <translation type="obsolete">總和</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
-        <translation>總和(&amp;S)</translation>
+        <translation type="obsolete">總和(&amp;S)</translation>
     </message>
     <message>
         <source>Absolute Value</source>
-        <translation>絕對值</translation>
+        <translation type="obsolete">絕對值</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
-        <translation>絕對(&amp;A)</translation>
+        <translation type="obsolete">絕對(&amp;A)</translation>
     </message>
     <message>
         <source>Sine</source>
-        <translation>正弦</translation>
+        <translation type="obsolete">正弦</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
-        <translation>正弦(&amp;N)</translation>
+        <translation type="obsolete">正弦(&amp;N)</translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation>反正弦</translation>
+        <translation type="obsolete">反正弦</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
-        <translation>反正弦(&amp;R)</translation>
+        <translation type="obsolete">反正弦(&amp;R)</translation>
     </message>
     <message>
         <source>Cosine</source>
-        <translation>餘弦</translation>
+        <translation type="obsolete">餘弦</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
-        <translation>餘弦(&amp;C)</translation>
+        <translation type="obsolete">餘弦(&amp;C)</translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation>反餘弦</translation>
+        <translation type="obsolete">反餘弦</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation>反餘弦(&amp;I)</translation>
+        <translation type="obsolete">反餘弦(&amp;I)</translation>
     </message>
     <message>
         <source>Tangent</source>
-        <translation>正切</translation>
+        <translation type="obsolete">正切</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
-        <translation>正切(&amp;T)</translation>
+        <translation type="obsolete">正切(&amp;T)</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation>反正切</translation>
+        <translation type="obsolete">反正切</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation>反正切(&amp;G)</translation>
+        <translation type="obsolete">反正切(&amp;G)</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation>座標的反正切</translation>
+        <translation type="obsolete">座標的反正切</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation>座標反正切(&amp;O)</translation>
+        <translation type="obsolete">座標反正切(&amp;O)</translation>
     </message>
     <message>
         <source>Exponential</source>
-        <translation>指數</translation>
+        <translation type="obsolete">指數</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
-        <translation>指數(&amp;E)</translation>
+        <translation type="obsolete">指數(&amp;E)</translation>
     </message>
     <message>
         <source>Logarithm</source>
-        <translation>對數</translation>
+        <translation type="obsolete">對數</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
-        <translation>對數(&amp;L)</translation>
+        <translation type="obsolete">對數(&amp;L)</translation>
     </message>
     <message>
         <source>Power</source>
-        <translation>乘冪</translation>
+        <translation type="obsolete">乘冪</translation>
     </message>
     <message>
         <source>&amp;Power</source>
-        <translation>乘冪(&amp;P)</translation>
+        <translation type="obsolete">乘冪(&amp;P)</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
-        <translation>數學的(&amp;M)</translation>
+        <translation type="obsolete">數學的(&amp;M)</translation>
     </message>
     <message>
         <source>Average</source>
-        <translation>平均數</translation>
+        <translation type="obsolete">平均數</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation>平均數(&amp;A)</translation>
+        <translation type="obsolete">平均數(&amp;A)</translation>
     </message>
     <message>
         <source>Maximum</source>
-        <translation>最大值</translation>
+        <translation type="obsolete">最大值</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
-        <translation>最大值(&amp;X)</translation>
+        <translation type="obsolete">最大值(&amp;X)</translation>
     </message>
     <message>
         <source>Minimum</source>
-        <translation>最小值</translation>
+        <translation type="obsolete">最小值</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
-        <translation>最小值(&amp;M)</translation>
+        <translation type="obsolete">最小值(&amp;M)</translation>
     </message>
     <message>
         <source>Count</source>
-        <translation>計數</translation>
+        <translation type="obsolete">計數</translation>
     </message>
     <message>
         <source>&amp;Count</source>
-        <translation>計數(&amp;C)</translation>
+        <translation type="obsolete">計數(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
-        <translation>統計(&amp;S)</translation>
+        <translation type="obsolete">統計(&amp;S)</translation>
     </message>
     <message>
         <source>Functions</source>
@@ -665,7 +665,7 @@
     </message>
     <message>
         <source>Help file not found!</source>
-        <translation>找不到說明檔!</translation>
+        <translation type="obsolete">找不到說明檔!</translation>
     </message>
     <message>
         <source>Opie Sheet
@@ -679,7 +679,7 @@ 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>Opie 試算表
+        <translation type="obsolete">Opie 試算表
 Opie 的試算表軟體
 QWDC Beta Winner (以 Sheet/Qt)
 
@@ -747,6 +747,404 @@ http://qtopia.sitebest.com</translation>
         <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>
@@ -756,7 +1154,7 @@ http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>Syntax error!</source>
-        <translation>語法錯誤!</translation>
+        <translation type="obsolete">語法錯誤!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
diff --git a/i18n/zh_TW/opie-update-symlinks.ts b/i18n/zh_TW/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/opieirc.ts b/i18n/zh_TW/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/zh_TW/opieirc.ts
+++ b/i18n/zh_TW/opieirc.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,6 +54,21 @@
     </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>
@@ -88,10 +99,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,10 +115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,15 +211,104 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <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>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -314,18 +406,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></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>
@@ -374,15 +458,30 @@ comma separated list of channel
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <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"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -464,6 +563,14 @@ comma separated list of channel
         <source>Settings</source>
         <translation type="unfinished"></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>
@@ -511,4 +618,31 @@ comma separated list of channel
         <translation type="unfinished"></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/zh_TW/opiemail.ts b/i18n/zh_TW/opiemail.ts
index 3aaf7e4..92df329 100644
--- a/i18n/zh_TW/opiemail.ts
+++ b/i18n/zh_TW/opiemail.ts
@@ -94,10 +94,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,6 +113,10 @@
         <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>
@@ -441,17 +441,17 @@
         <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 listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <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>
@@ -834,6 +834,18 @@ All mails will be deleted.</source>
         <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>
@@ -1059,13 +1071,13 @@ All mails will be deleted.</source>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
@@ -1102,6 +1114,10 @@ All mails will be deleted.</source>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
diff --git a/i18n/zh_TW/opieplayer2.ts b/i18n/zh_TW/opieplayer2.ts
index 8b4595f..1395d42 100644
--- a/i18n/zh_TW/opieplayer2.ts
+++ b/i18n/zh_TW/opieplayer2.ts
@@ -7,6 +7,13 @@
     </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>
@@ -166,6 +173,30 @@ this playlist?</source>
         <source>Add  URL</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Directory</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>
@@ -203,6 +234,13 @@ this playlist?</source>
     </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>
@@ -216,23 +254,32 @@ this playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No input plugin found for this media type</source>
+        <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>No demux plugin found for this media type</source>
+        <source>&lt;qt&gt;Demuxing failed for this media type&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Demuxing failed for this media type</source>
+        <source>&lt;qt&gt;Malformed MRL&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Malformed MRL</source>
+        <source>&lt;qt&gt;Input failed&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Some other error</source>
+        <source>&lt;qt&gt;Some other error&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/opierec.ts b/i18n/zh_TW/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/zh_TW/opierec.ts
+++ b/i18n/zh_TW/opierec.ts
@@ -79,10 +79,6 @@ or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></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="unfinished"></translation>
@@ -145,18 +141,6 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -165,15 +149,15 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/opimconverter.ts b/i18n/zh_TW/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/zh_TW/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/osearch.ts b/i18n/zh_TW/osearch.ts
index e20a0f4..97ed663 100644
--- a/i18n/zh_TW/osearch.ts
+++ b/i18n/zh_TW/osearch.ts
@@ -14,10 +14,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -65,6 +61,10 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
@@ -96,35 +96,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show completed tasks</source>
+        <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>show past events</source>
+        <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search in dates</source>
+        <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File: </source>
+        <source>searching %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link: </source>
+        <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mimetype: </source>
+        <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
+        <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>searching %1</source>
+        <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index 09ab791..f6f659a 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -25,6 +25,10 @@
         <source>Elemental Composition (%):</source>
         <translation>元素成分 (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
diff --git a/i18n/zh_TW/oyatzee.ts b/i18n/zh_TW/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/zh_TW/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/packagemanager.ts b/i18n/zh_TW/packagemanager.ts
index 4d2c663..e189dab 100644
--- a/i18n/zh_TW/packagemanager.ts
+++ b/i18n/zh_TW/packagemanager.ts
@@ -1,8 +1,5 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
@@ -51,6 +48,46 @@
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
@@ -190,9 +227,6 @@
     </message>
 </context>
 <context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
@@ -207,34 +241,18 @@
         <translation>更新  List</translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
-    </message>
-    <message>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
-    </message>
-    <message>
         <source>Actions</source>
         <translation>動作</translation>
     </message>
@@ -243,42 +261,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation>瀏覽</translation>
     </message>
@@ -287,14 +285,6 @@
         <translation>設定</translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Servers:</source>
         <translation type="obsolete">伺服器:</translation>
     </message>
@@ -339,84 +329,140 @@
         <translation type="obsolete">重新安裝</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -451,26 +497,6 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -526,6 +552,148 @@ Click inside the box at the left to select a package.</source>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
@@ -558,6 +726,18 @@ Click inside the box at the left to select a package.</source>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
@@ -567,9 +747,6 @@ Click inside the box at the left to select a package.</source>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
diff --git a/i18n/zh_TW/powerchord.ts b/i18n/zh_TW/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/zh_TW/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</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>
+</TS>
diff --git a/i18n/zh_TW/pyquicklauncher.ts b/i18n/zh_TW/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 74932d3..ac4ac62 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -379,6 +379,13 @@ Please charge the back-up battery.</source>
     </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>
@@ -398,6 +405,13 @@ Please charge the back-up battery.</source>
     </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>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index f785032..f405b68 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -70,40 +70,32 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
@@ -113,6 +105,26 @@ You can only select an actually configured user.</source>
         <source>None</source>
         <translation type="unfinished">無</translation>
     </message>
+    <message>
+        <source>Important notice</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-multiauth-*&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>
+    <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>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
@@ -137,23 +149,43 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <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>Allow to bypass authentication</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/sfcave.ts b/i18n/zh_TW/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/zh_TW/sfcave.ts
+++ b/i18n/zh_TW/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/simple-icon.ts b/i18n/zh_TW/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/zh_TW/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/simple-main.ts b/i18n/zh_TW/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/zh_TW/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/simple-pim.ts b/i18n/zh_TW/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/zh_TW/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <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> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/simple.ts b/i18n/zh_TW/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/zh_TW/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/stocktickertest.ts b/i18n/zh_TW/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/zh_TW/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/sysinfo.ts b/i18n/zh_TW/sysinfo.ts
index ed8d0e7..fa5b4d4 100644
--- a/i18n/zh_TW/sysinfo.ts
+++ b/i18n/zh_TW/sysinfo.ts
@@ -61,10 +61,6 @@
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
@@ -344,6 +340,10 @@ to this process?</source>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
@@ -387,5 +387,9 @@ to this process?</source>
         <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 688df1d..169890e 100644
--- a/i18n/zh_TW/tableviewer.ts
+++ b/i18n/zh_TW/tableviewer.ts
@@ -3,11 +3,11 @@
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() 無法設定預設值 %1, Key not added.</translation>
+        <translation type="obsolete">KeyList::addKey() 無法設定預設值 %1, Key not added.</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation>DataElem::setField(%1, %2) No valid type found</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) No valid type found</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index 5b7b74a..f941791 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -203,6 +203,10 @@ Go ahead and save?
 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>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index e5b12d0..daa3839 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -3,7 +3,7 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">今日</translation>
+        <translation type="unfinished">今日</translation>
     </message>
     <message>
         <source>Owned by </source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>找不到plugins</translation>
+        <translation type="obsolete">找不到plugins</translation>
     </message>
     <message>
         <source>No plugins activated</source>
@@ -25,6 +25,14 @@
         <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>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 6871964..2d3a617 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -9,6 +9,29 @@
         <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>
@@ -34,6 +57,17 @@
     </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>
@@ -51,48 +85,32 @@
         <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation type="unfinished">利用樣板建立新事項</translation>
+        <translation type="obsolete">利用樣板建立新事項</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation type="unfinished">新增待辦事項</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">新增待辦事項</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">編輯待辦事項</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">編輯待辦事項</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation type="unfinished">檢視待辦事項</translation>
+        <translation type="obsolete">檢視待辦事項</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation type="unfinished">刪除...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">刪除...</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation type="unfinished">刪除全部....</translation>
+        <translation type="obsolete">刪除全部....</translation>
     </message>
     <message>
         <source>Delete completed</source>
@@ -100,19 +118,15 @@
     </message>
     <message>
         <source>Duplicate</source>
-        <translation type="unfinished">複製事項</translation>
+        <translation type="obsolete">複製事項</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation type="unfinished">傳送資料</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">傳送資料</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished">搜尋</translation>
+        <translation type="obsolete">搜尋</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
@@ -132,15 +146,15 @@
     </message>
     <message>
         <source>Data</source>
-        <translation type="unfinished">資料管理</translation>
+        <translation type="obsolete">資料管理</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">分類目錄</translation>
+        <translation type="obsolete">分類目錄</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished">設定選項</translation>
+        <translation type="obsolete">設定選項</translation>
     </message>
     <message>
         <source>QuickEdit</source>
@@ -158,11 +172,11 @@ The list displays the following information:
     </message>
     <message>
         <source>All Categories</source>
-        <translation type="unfinished">全部目錄</translation>
+        <translation type="obsolete">全部目錄</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished">未分類的</translation>
+        <translation type="obsolete">未分類的</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -215,7 +229,7 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation type="unfinished">樣板管理</translation>
+        <translation type="obsolete">樣板管理</translation>
     </message>
     <message>
         <source>Template Editor</source>
diff --git a/i18n/zh_TW/wellenreiter.ts b/i18n/zh_TW/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/zh_TW/wellenreiter.ts
+++ b/i18n/zh_TW/wellenreiter.ts
@@ -117,10 +117,6 @@ is not available on this system
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
@@ -169,6 +165,10 @@ joining a net.</source>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
@@ -212,10 +212,6 @@ joining a net.</source>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -516,10 +512,6 @@ joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,6 +591,14 @@ joining a net.</source>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
diff --git a/i18n/zh_TW/zlines.ts b/i18n/zh_TW/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/zh_TW/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/zsafe.ts b/i18n/zh_TW/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/zh_TW/zsafe.ts
+++ b/i18n/zh_TW/zsafe.ts
@@ -422,7 +422,7 @@ shows the list of dirs and files</source>
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
@@ -506,7 +506,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -554,7 +554,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
@@ -566,7 +566,7 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
@@ -698,7 +698,7 @@ sichern</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
@@ -706,11 +706,11 @@ sichern</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
@@ -726,7 +726,7 @@ sichern</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
@@ -734,21 +734,7 @@ sichern</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
@@ -811,11 +797,35 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <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>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/zsame.ts b/i18n/zh_TW/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/zh_TW/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>